diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 1674353d..2399d26e 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -2,12 +2,6 @@ "version": 1, "isRoot": true, "tools": { - "paket": { - "version": "7.1.5", - "commands": [ - "paket" - ] - }, "fake-cli": { "version": "5.23.1", "commands": [ diff --git a/.dockerignore b/.dockerignore index de810734..24a8c282 100644 --- a/.dockerignore +++ b/.dockerignore @@ -183,7 +183,6 @@ **/release.cmd **/release.sh **/localpackages/ -**/paket-files **/*.orig **/docs/content/license.md **/docs/content/release-notes.md @@ -195,8 +194,6 @@ # Deploy artifacts artifacts/ -paket-files/ -.paket/load/ tools/ # Ionide diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..acf47a9b --- /dev/null +++ b/.editorconfig @@ -0,0 +1,18 @@ +root = true + +# Source files +[*.{fs,fsx}] +indent_style = space +indent_size = 4 +trim_trailing_whitespace = true +insert_final_newline = true +end_of_line = lf + +# Project files +[*.{csproj,fsproj,props}] +indent_size = 2 + +# YAML files +[*.yml] +indent_size = 2 +indent_style = space diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8ce02302..4f32a5d7 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,3 +10,6 @@ updates: directory: "/" schedule: interval: "daily" + ignore: + - dependency-name: "FSharp.Core" + - dependency-name: "System.Configuration.ConfigurationManager" \ No newline at end of file diff --git a/.gitignore b/.gitignore index 28f0b17e..95b96ef2 100644 --- a/.gitignore +++ b/.gitignore @@ -187,7 +187,6 @@ nuget/*.nupkg release.cmd release.sh localpackages/ -paket-files *.orig docs/content/license.md docs/content/release-notes.md @@ -200,8 +199,6 @@ launchSettings.json # Deploy artifacts /artifacts/ -/paket-files/ -/.paket/load/ /tools/ # Ionide diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets deleted file mode 100644 index e230bb21..00000000 --- a/.paket/Paket.Restore.targets +++ /dev/null @@ -1,557 +0,0 @@ - - - - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - $(MSBuildVersion) - 15.0.0 - false - true - - true - $(MSBuildThisFileDirectory) - $(MSBuildThisFileDirectory)..\ - $(PaketRootPath)paket-files\paket.restore.cached - $(PaketRootPath)paket.lock - classic - proj - assembly - native - /Library/Frameworks/Mono.framework/Commands/mono - mono - - - $(PaketRootPath)paket.bootstrapper.exe - $(PaketToolsPath)paket.bootstrapper.exe - $([System.IO.Path]::GetDirectoryName("$(PaketBootStrapperExePath)"))\ - - "$(PaketBootStrapperExePath)" - $(MonoPath) --runtime=v4.0.30319 "$(PaketBootStrapperExePath)" - - - - - true - true - - - True - - - False - - $(BaseIntermediateOutputPath.TrimEnd('\').TrimEnd('\/')) - - - - - - - - - $(PaketRootPath)paket - $(PaketToolsPath)paket - - - - - - $(PaketRootPath)paket.exe - $(PaketToolsPath)paket.exe - - - - - - <_DotnetToolsJson Condition="Exists('$(PaketRootPath)/.config/dotnet-tools.json')">$([System.IO.File]::ReadAllText("$(PaketRootPath)/.config/dotnet-tools.json")) - <_ConfigContainsPaket Condition=" '$(_DotnetToolsJson)' != ''">$(_DotnetToolsJson.Contains('"paket"')) - <_ConfigContainsPaket Condition=" '$(_ConfigContainsPaket)' == ''">false - - - - - - - - - - - <_PaketCommand>dotnet paket - - - - - - $(PaketToolsPath)paket - $(PaketBootStrapperExeDir)paket - - - paket - - - - - <_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)")) - <_PaketCommand Condition=" '$(_PaketCommand)' == '' AND '$(_PaketExeExtension)' == '.dll' ">dotnet "$(PaketExePath)" - <_PaketCommand Condition=" '$(_PaketCommand)' == '' AND '$(OS)' != 'Windows_NT' AND '$(_PaketExeExtension)' == '.exe' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)" - <_PaketCommand Condition=" '$(_PaketCommand)' == '' ">"$(PaketExePath)" - - - - - - - - - - - - - - - - - - - - - true - $(NoWarn);NU1603;NU1604;NU1605;NU1608 - false - true - - - - - - - - - $([System.IO.File]::ReadAllText('$(PaketRestoreCacheFile)')) - - - - - - - $([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `": "`)[0].Replace(`"`, ``).Replace(` `, ``)) - $([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `": "`)[1].Replace(`"`, ``).Replace(` `, ``)) - - - - - %(PaketRestoreCachedKeyValue.Value) - %(PaketRestoreCachedKeyValue.Value) - - - - - true - false - true - - - - - true - - - - - - - - - - - - - - - - - - - $(PaketIntermediateOutputPath)\$(MSBuildProjectFile).paket.references.cached - - $(MSBuildProjectFullPath).paket.references - - $(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references - - $(MSBuildProjectDirectory)\paket.references - - false - true - true - references-file-or-cache-not-found - - - - - $([System.IO.File]::ReadAllText('$(PaketReferencesCachedFilePath)')) - $([System.IO.File]::ReadAllText('$(PaketOriginalReferencesFilePath)')) - references-file - false - - - - - false - - - - - true - target-framework '$(TargetFramework)' or '$(TargetFrameworks)' files @(PaketResolvedFilePaths) - - - - - - - - - - - false - true - - - - - - - - - - - $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',').Length) - $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0]) - $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1]) - $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4]) - $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5]) - $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[6]) - $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[7]) - - - %(PaketReferencesFileLinesInfo.PackageVersion) - All - runtime - $(ExcludeAssets);contentFiles - $(ExcludeAssets);build;buildMultitargeting;buildTransitive - true - true - - - - - $(PaketIntermediateOutputPath)/$(MSBuildProjectFile).paket.clitools - - - - - - - - - $([System.String]::Copy('%(PaketCliToolFileLines.Identity)').Split(',')[0]) - $([System.String]::Copy('%(PaketCliToolFileLines.Identity)').Split(',')[1]) - - - %(PaketCliToolFileLinesInfo.PackageVersion) - - - - - - - - - - false - - - - - - <_NuspecFilesNewLocation Include="$(PaketIntermediateOutputPath)\$(Configuration)\*.nuspec"/> - - - - - - $(MSBuildProjectDirectory)/$(MSBuildProjectFile) - true - false - true - false - true - false - true - false - true - false - true - $(PaketIntermediateOutputPath)\$(Configuration) - $(PaketIntermediateOutputPath) - - - - <_NuspecFiles Include="$(AdjustedNuspecOutputPath)\*.$(PackageVersion.Split(`+`)[0]).nuspec"/> - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Argu.sln b/Argu.sln index 15447c27..ec908371 100644 --- a/Argu.sln +++ b/Argu.sln @@ -21,31 +21,23 @@ 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 + .editorconfig = .editorconfig .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 Directory.Build.props = Directory.Build.props + Directory.Packages.props = Directory.Packages.props docker-build.sh = docker-build.sh 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 @@ -70,10 +62,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 @@ -100,8 +88,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} diff --git a/Directory.Build.props b/Directory.Build.props index 8f325cb9..5056cedc 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,6 +2,7 @@ 5 true + true @@ -15,10 +16,10 @@ https://fsprojects.github.io/Argu/ MIT - + https://github.com/fsprojects/Argu/blob/master/LICENSE.md https://github.com/fsprojects/Argu/blob/master/RELEASE_NOTES.md - + \ No newline at end of file diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 00000000..15cc74b4 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,19 @@ + + + true + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build.cmd b/build.cmd index ee92ce1f..031297f7 100644 --- a/build.cmd +++ b/build.cmd @@ -1,7 +1,4 @@ @echo off -export PAKET_SKIP_RESTORE_TARGETS=true - dotnet tool restore -dotnet paket restore dotnet fsi build.fsx %* \ No newline at end of file diff --git a/build.sh b/build.sh index a98a1ef0..f27294cd 100755 --- a/build.sh +++ b/build.sh @@ -2,8 +2,5 @@ cd `dirname $0` -export PAKET_SKIP_RESTORE_TARGETS=true - dotnet tool restore && \ -dotnet paket restore && \ dotnet fsi build.fsx "$@" \ No newline at end of file diff --git a/nuget.config b/nuget.config new file mode 100644 index 00000000..bb9ff4c8 --- /dev/null +++ b/nuget.config @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/paket.dependencies b/paket.dependencies deleted file mode 100644 index f85938cc..00000000 --- a/paket.dependencies +++ /dev/null @@ -1,18 +0,0 @@ -source https://api.nuget.org/v3/index.json -framework: netstandard2.0 -storage: none - -nuget FSharp.Core >= 4.3.2 lowest_matching:true -nuget System.Configuration.ConfigurationManager >= 4.0 lowest_matching:true - -group Tests - source https://api.nuget.org/v3/index.json - framework: net6.0 - storage: none - - nuget FSharp.Core ~> 6.0 - nuget Microsoft.NET.Test.Sdk ~> 17.0 - nuget xunit ~> 2.4 - nuget xunit.runner.visualstudio ~> 2.4.0 version_in_path: true - nuget Unquote ~> 6.0 - nuget FsCheck ~> 3.0 prerelease \ No newline at end of file diff --git a/paket.lock b/paket.lock deleted file mode 100644 index 855cf66f..00000000 --- a/paket.lock +++ /dev/null @@ -1,65 +0,0 @@ -STORAGE: NONE -RESTRICTION: == netstandard2.0 -NUGET - remote: https://api.nuget.org/v3/index.json - FSharp.Core (4.3.2) - System.Buffers (4.5.1) - System.Configuration.ConfigurationManager (4.4) - System.Security.Cryptography.ProtectedData (>= 4.4) - System.Memory (4.5.5) - System.Buffers (>= 4.5.1) - System.Numerics.Vectors (>= 4.4) - System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - System.Numerics.Vectors (4.5) - System.Runtime.CompilerServices.Unsafe (6.0) - System.Security.Cryptography.ProtectedData (6.0) - System.Memory (>= 4.5.4) - -GROUP Tests -STORAGE: NONE -RESTRICTION: == net6.0 -NUGET - remote: https://api.nuget.org/v3/index.json - FsCheck (3.0.0-beta2) - FSharp.Core (>= 4.5) - FSharp.Core (6.0.6) - Microsoft.CodeCoverage (17.3.2) - Microsoft.NET.Test.Sdk (17.3.2) - Microsoft.CodeCoverage (>= 17.3.2) - Microsoft.TestPlatform.TestHost (>= 17.3.2) - Microsoft.NETCore.Platforms (6.0.6) - Microsoft.TestPlatform.ObjectModel (17.3.2) - NuGet.Frameworks (>= 5.11) - System.Reflection.Metadata (>= 1.6) - Microsoft.TestPlatform.TestHost (17.3.2) - Microsoft.TestPlatform.ObjectModel (>= 17.3.2) - Newtonsoft.Json (>= 9.0.1) - NETStandard.Library (2.0.3) - Microsoft.NETCore.Platforms (>= 1.1) - Newtonsoft.Json (13.0.1) - NuGet.Frameworks (6.3.1) - System.Collections.Immutable (6.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Reflection.Metadata (6.0.1) - System.Collections.Immutable (>= 6.0) - System.Runtime.CompilerServices.Unsafe (6.0) - Unquote (6.1) - FSharp.Core (>= 4.7.2) - xunit (2.4.2) - xunit.analyzers (>= 1.0) - xunit.assert (>= 2.4.2) - xunit.core (2.4.2) - xunit.abstractions (2.0.3) - xunit.analyzers (1.0) - xunit.assert (2.4.2) - NETStandard.Library (>= 1.6.1) - xunit.core (2.4.2) - xunit.extensibility.core (2.4.2) - xunit.extensibility.execution (2.4.2) - xunit.extensibility.core (2.4.2) - NETStandard.Library (>= 1.6.1) - xunit.abstractions (>= 2.0.3) - xunit.extensibility.execution (2.4.2) - NETStandard.Library (>= 1.6.1) - xunit.extensibility.core (2.4.2) - xunit.runner.visualstudio (2.4.5) - version_in_path: true diff --git a/samples/Argu.Samples.LS/Argu.Samples.LS.fsproj b/samples/Argu.Samples.LS/Argu.Samples.LS.fsproj index 629571c7..6c74dcc9 100644 --- a/samples/Argu.Samples.LS/Argu.Samples.LS.fsproj +++ b/samples/Argu.Samples.LS/Argu.Samples.LS.fsproj @@ -7,12 +7,10 @@ false - - - + + - + - diff --git a/samples/Argu.Samples.LS/paket.references b/samples/Argu.Samples.LS/paket.references deleted file mode 100644 index cc3b1251..00000000 --- a/samples/Argu.Samples.LS/paket.references +++ /dev/null @@ -1,2 +0,0 @@ -group Tests - FSharp.Core \ No newline at end of file diff --git a/src/Argu/Argu.fsproj b/src/Argu/Argu.fsproj index fdc487da..50ef4cce 100644 --- a/src/Argu/Argu.fsproj +++ b/src/Argu/Argu.fsproj @@ -1,5 +1,4 @@ - - + netstandard2.0 true @@ -7,24 +6,26 @@ logo.png - - - - - - - - - - - - - - + + + + + + + + + + + + + - + + + + + - \ No newline at end of file diff --git a/src/Argu/paket.references b/src/Argu/paket.references deleted file mode 100644 index 97c2a030..00000000 --- a/src/Argu/paket.references +++ /dev/null @@ -1,2 +0,0 @@ -FSharp.Core -System.Configuration.ConfigurationManager \ No newline at end of file diff --git a/tests/Argu.Tests/Argu.Tests.fsproj b/tests/Argu.Tests/Argu.Tests.fsproj index 6a4f176a..cf91aa9c 100644 --- a/tests/Argu.Tests/Argu.Tests.fsproj +++ b/tests/Argu.Tests/Argu.Tests.fsproj @@ -3,11 +3,17 @@ net6.0 - - + - + + + + + + + + + - diff --git a/tests/Argu.Tests/paket.references b/tests/Argu.Tests/paket.references deleted file mode 100644 index ec028cdd..00000000 --- a/tests/Argu.Tests/paket.references +++ /dev/null @@ -1,7 +0,0 @@ -group Tests - FSharp.Core - xunit - xunit.runner.visualstudio - Microsoft.NET.Test.Sdk - Unquote - FsCheck \ No newline at end of file