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

chore: Remove paket #205

Merged
merged 6 commits into from
Dec 14, 2023
Merged
Show file tree
Hide file tree
Changes from 2 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
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"
]
},
"fake-cli": {
"version": "5.23.1",
"commands": [
Expand Down
3 changes: 0 additions & 3 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@
**/release.cmd
**/release.sh
**/localpackages/
**/paket-files
**/*.orig
**/docs/content/license.md
**/docs/content/release-notes.md
Expand All @@ -195,8 +194,6 @@

# Deploy artifacts
artifacts/
paket-files/
.paket/load/
tools/

# Ionide
Expand Down
3 changes: 3 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ updates:
directory: "/"
schedule:
interval: "daily"
ignore:
- dependency-name: "FSharp.Core"
- dependency-name: "System.Configuration.ConfigurationManager"
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@ nuget/*.nupkg
release.cmd
release.sh
localpackages/
paket-files
*.orig
docs/content/license.md
docs/content/release-notes.md
Expand All @@ -200,8 +199,6 @@ launchSettings.json

# Deploy artifacts
/artifacts/
/paket-files/
/.paket/load/
/tools/

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

This file was deleted.

9 changes: 0 additions & 9 deletions Argu.sln
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
.github\workflows\build.yml = .github\workflows\build.yml
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{306D68AD-1E01-4367-9498-EF4CEDE0AF38}"
ProjectSection(SolutionItems) = preProject
.paket\Paket.Restore.targets = .paket\Paket.Restore.targets
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2687163A-E0EA-4EC6-A388-430314AA8C85}"
ProjectSection(SolutionItems) = preProject
.dockerignore = .dockerignore
.gitignore = .gitignore
.tfignore = .tfignore
bartelink marked this conversation as resolved.
Show resolved Hide resolved
.travis.yml = .travis.yml
appveyor.yml = appveyor.yml
Argu.sln = Argu.sln
bartelink marked this conversation as resolved.
Show resolved Hide resolved
build.cmd = build.cmd
build.fsx = build.fsx
Expand All @@ -44,8 +37,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
Dockerfile = Dockerfile
global.json = global.json
LICENSE.md = LICENSE.md
paket.dependencies = paket.dependencies
paket.lock = paket.lock
README.md = README.md
RELEASE_NOTES.md = RELEASE_NOTES.md
EndProjectSection
Expand Down
1 change: 1 addition & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<PropertyGroup>
<WarningLevel>5</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
</PropertyGroup>

<!-- NuGet Metadata -->
Expand Down
15 changes: 15 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="FSharp.Core" Version="4.3.2" />
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="4.4.0" />
bartelink marked this conversation as resolved.
Show resolved Hide resolved
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageVersion Include="xunit" Version="2.4.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
<PackageVersion Include="Unquote" Version="6.1.0" />
<PackageVersion Include="FsCheck" Version="3.0.0-rc1" />
bartelink marked this conversation as resolved.
Show resolved Hide resolved
<PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.1.1" />
</ItemGroup>
</Project>
3 changes: 0 additions & 3 deletions build.cmd
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
@echo off

export PAKET_SKIP_RESTORE_TARGETS=true

dotnet tool restore
dotnet paket restore
dotnet fsi build.fsx %*
3 changes: 0 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,5 @@

cd `dirname $0`

export PAKET_SKIP_RESTORE_TARGETS=true

dotnet tool restore && \
dotnet paket restore && \
dotnet fsi build.fsx "$@"
13 changes: 13 additions & 0 deletions nuget.config
nojaf marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
<clear />
<add key="nuget" value="https://api.nuget.org/v3/index.json" />
</packageSources>
<packageSourceMapping>
<packageSource key="nuget">
<package pattern="*" />
</packageSource>
</packageSourceMapping>
</configuration>
18 changes: 0 additions & 18 deletions paket.dependencies

This file was deleted.

65 changes: 0 additions & 65 deletions paket.lock

This file was deleted.

2 changes: 0 additions & 2 deletions samples/Argu.Samples.LS/Argu.Samples.LS.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@
<ItemGroup>
<Compile Include="Arguments.fs" />
<Compile Include="Program.fs" />
<None Include="paket.references" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Argu\Argu.fsproj" />
</ItemGroup>
<Import Project="..\..\.paket\Paket.Restore.targets" />
</Project>
2 changes: 0 additions & 2 deletions samples/Argu.Samples.LS/paket.references

This file was deleted.

6 changes: 3 additions & 3 deletions src/Argu/Argu.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
<Compile Include="Parsers\Cli.fs" />
<Compile Include="Parsers\KeyValue.fs" />
<Compile Include="ArgumentParser.fs" />
<None Include="paket.references" />
<None Include="..\..\resource\logo.png" Pack="true" PackagePath="" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="FSharp.Core" />
<PackageReference Include="System.Configuration.ConfigurationManager" />
<!-- SourceLink etc -->
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="DotNet.ReproducibleBuilds" PrivateAssets="All" />
</ItemGroup>
<Import Project="..\..\.paket\Paket.Restore.targets" />
</Project>
2 changes: 0 additions & 2 deletions src/Argu/paket.references

This file was deleted.

10 changes: 8 additions & 2 deletions tests/Argu.Tests/Argu.Tests.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,16 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="Tests.fs" />
<None Include="paket.references" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Argu\Argu.fsproj" />
</ItemGroup>
<Import Project="..\..\.paket\Paket.Restore.targets" />
<ItemGroup>
<PackageReference Include="FSharp.Core" VersionOverride="6.0.7" />
nojaf marked this conversation as resolved.
Show resolved Hide resolved
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
bartelink marked this conversation as resolved.
Show resolved Hide resolved
<PackageReference Include="Unquote" />
<PackageReference Include="FsCheck" />
bartelink marked this conversation as resolved.
Show resolved Hide resolved
</ItemGroup>
</Project>
7 changes: 0 additions & 7 deletions tests/Argu.Tests/paket.references

This file was deleted.