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.

Sign up for GitHub

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

chore: Remove paket #205

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1a7ce44
chore: Replace Paket with NuGet.
nojaf Dec 14, 2023
f447f08
Ignore FSharp.Core and System.Configuration.ConfigurationManager by d…
nojaf Dec 14, 2023
ca6e0d4
Tidy xml files
bartelink Dec 14, 2023
82b7952
Add .editorconfig
bartelink Dec 14, 2023
6196bd4
Apply rules to proj files
bartelink Dec 14, 2023
b2bda11
reorder sln text
bartelink Dec 14, 2023
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

21 changes: 3 additions & 18 deletions Argu.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,13 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{EE42293D-9398-4EF4-B151-9DE992EBB85A}"
ProjectSection(SolutionItems) = preProject
.github\workflows\build.yml = .github\workflows\build.yml
.github\workflows\release.yml = .github\workflows\release.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}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".project", ".project", "{2687163A-E0EA-4EC6-A388-430314AA8C85}"
ProjectSection(SolutionItems) = preProject
.dockerignore = .dockerignore
.gitignore = .gitignore
.tfignore = .tfignore
.travis.yml = .travis.yml
appveyor.yml = appveyor.yml
Argu.sln = Argu.sln
build.cmd = build.cmd
build.fsx = build.fsx
build.sh = build.sh
Expand All @@ -44,10 +36,9 @@ 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
Directory.Packages.props = Directory.Packages.props
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{C9E28045-41C6-422E-9928-4220EF3FF19B}"
Expand All @@ -70,10 +61,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "resource", "resource", "{B1
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{A15390A5-BC39-433F-BA25-8775B4C2E329}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{93AB3CBB-7714-49DD-9C6F-40E153A66E8F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E40F0B06-703E-4541-826F-3B8AED67AF7B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -100,8 +87,6 @@ Global
{EE42293D-9398-4EF4-B151-9DE992EBB85A} = {83FE66F8-6E59-4178-8962-11117B51F39C}
{10ED3503-22F2-42EF-8B35-C979A5B700D0} = {C9E28045-41C6-422E-9928-4220EF3FF19B}
{E0563A30-4451-4DF2-9D21-26C76EB85C22} = {A15390A5-BC39-433F-BA25-8775B4C2E329}
{D3E958F9-5FFF-462E-BDC7-A03272A9F5D9} = {93AB3CBB-7714-49DD-9C6F-40E153A66E8F}
{8E234746-5098-4400-98F1-62C77AB91711} = {E40F0B06-703E-4541-826F-3B8AED67AF7B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {99215464-9AB5-4BC3-A033-92EA250F8FC1}
Expand Down
43 changes: 22 additions & 21 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<WarningLevel>5</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup>
<WarningLevel>5</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
</PropertyGroup>

<!-- NuGet Metadata -->
<PropertyGroup>
<Description>A declarative command line and XML configuration parser for F# applications.</Description>
<Authors>Eirik Tsarpalis</Authors>
<Copyright>2019</Copyright>
<PackageTags>F#, argument, commandline, parser</PackageTags>
<!-- NOTE while ReproducibleBuilds/SourceLink derives the same value, other stuff in the FAKE fsx require this explicitly-->
<RepositoryUrl>https://github.com/fsprojects/Argu/</RepositoryUrl>
<PackageProjectUrl>https://fsprojects.github.io/Argu/</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
</PropertyGroup>
<!-- FsDocs -->
<PropertyGroup>
<FsDocsLicenseLink>https://github.com/fsprojects/Argu/blob/master/LICENSE.md</FsDocsLicenseLink>
<FsDocsReleaseNotesLink>https://github.com/fsprojects/Argu/blob/master/RELEASE_NOTES.md</FsDocsReleaseNotesLink>
</PropertyGroup>
<!-- NuGet Metadata -->
bartelink marked this conversation as resolved.
Show resolved Hide resolved
<PropertyGroup>
<Description>A declarative command line and XML configuration parser for F# applications.</Description>
<Authors>Eirik Tsarpalis</Authors>
<Copyright>2019</Copyright>
<PackageTags>F#, argument, commandline, parser</PackageTags>
<!-- NOTE while ReproducibleBuilds/SourceLink derives the same value, other stuff in the FAKE fsx require this explicitly-->
<RepositoryUrl>https://github.com/fsprojects/Argu/</RepositoryUrl>
<PackageProjectUrl>https://fsprojects.github.io/Argu/</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
</PropertyGroup>

<!-- FsDocs -->
<PropertyGroup>
<FsDocsLicenseLink>https://github.com/fsprojects/Argu/blob/master/LICENSE.md</FsDocsLicenseLink>
<FsDocsReleaseNotesLink>https://github.com/fsprojects/Argu/blob/master/RELEASE_NOTES.md</FsDocsReleaseNotesLink>
</PropertyGroup>
</Project>
19 changes: 19 additions & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<!-- Build deps -->
<PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.1.1" />

<!-- Impl deps -->
<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

<!-- Test deps -->
<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" />
</ItemGroup>
</Project>
3 changes: 0 additions & 3 deletions build.cmd
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

65 changes: 0 additions & 65 deletions paket.lock
View file
Open in desktop

This file was deleted.

30 changes: 14 additions & 16 deletions samples/Argu.Samples.LS/Argu.Samples.LS.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<OutputType>Exe</OutputType>
<AssemblyName>ls</AssemblyName>
<!-- NOTE required as EXEs by default are treated as packable by the FAKE Release fsx -->
<IsPackable>false</IsPackable>
</PropertyGroup>
<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" />
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<OutputType>Exe</OutputType>
<AssemblyName>ls</AssemblyName>
<!-- NOTE required as EXEs by default are treated as packable by the FAKE Release fsx -->
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<Compile Include="Arguments.fs"/>
<Compile Include="Program.fs"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Argu\Argu.fsproj"/>
</ItemGroup>
</Project>
2 changes: 0 additions & 2 deletions samples/Argu.Samples.LS/paket.references
View file
Open in desktop

This file was deleted.

59 changes: 30 additions & 29 deletions src/Argu/Argu.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<PackageIcon>logo.png</PackageIcon>
</PropertyGroup>
<ItemGroup>
<Compile Include="Types.fs" />
<Compile Include="Attributes.fs" />
<Compile Include="Utils.fs" />
<Compile Include="ConfigReaders.fs" />
<Compile Include="UnionArgInfo.fs" />
<Compile Include="PreCompute.fs" />
<Compile Include="UnParsers.fs" />
<Compile Include="ParseResults.fs" />
<Compile Include="Parsers\Common.fs" />
<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>
<!-- SourceLink etc -->
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.1.1" PrivateAssets="All" />
</ItemGroup>
<Import Project="..\..\.paket\Paket.Restore.targets" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<PackageIcon>logo.png</PackageIcon>
</PropertyGroup>
<ItemGroup>
<Compile Include="Types.fs"/>
<Compile Include="Attributes.fs"/>
<Compile Include="Utils.fs"/>
<Compile Include="ConfigReaders.fs"/>
<Compile Include="UnionArgInfo.fs"/>
<Compile Include="PreCompute.fs"/>
<Compile Include="UnParsers.fs"/>
<Compile Include="ParseResults.fs"/>
<Compile Include="Parsers\Common.fs"/>
<Compile Include="Parsers\Cli.fs"/>
<Compile Include="Parsers\KeyValue.fs"/>
<Compile Include="ArgumentParser.fs"/>
<None Include="..\..\resource\logo.png" Pack="true" PackagePath=""/>
</ItemGroup>
<ItemGroup>
<!-- SourceLink etc -->
<PackageReference Include="DotNet.ReproducibleBuilds" PrivateAssets="All"/>

<PackageReference Include="FSharp.Core"/>

<PackageReference Include="System.Configuration.ConfigurationManager"/>
</ItemGroup>
</Project>
Loading