From 953641db72209a62551e1520f2010b5b740f1b56 Mon Sep 17 00:00:00 2001 From: Ruben Bartelink Date: Tue, 28 Nov 2023 11:09:52 +0000 Subject: [PATCH 1/3] DotNet.ReproducibleBuilds --- Directory.Build.props | 10 +--------- paket.dependencies | 2 +- paket.lock | 20 ++++++++++++++++--- .../Argu.Samples.LS/Argu.Samples.LS.fsproj | 5 ++--- src/Argu/Argu.fsproj | 6 ++---- src/Argu/paket.references | 2 +- tests/Argu.Tests/Argu.Tests.fsproj | 3 +-- 7 files changed, 25 insertions(+), 23 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index a26a527a..caf0895b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -9,17 +9,9 @@ A declarative command line and XML configuration parser for F# applications. Eirik Tsarpalis 2019 - F#, argument, parser - https://github.com/fsprojects/Argu/ + F#, argument, commandline, parser https://fsprojects.github.io/Argu/ MIT - git - - true - true - $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb - - diff --git a/paket.dependencies b/paket.dependencies index baa80ef3..2448d03c 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -4,7 +4,7 @@ storage: none nuget FSharp.Core >= 4.3.2 lowest_matching:true nuget System.Configuration.ConfigurationManager >= 4.0 lowest_matching:true -nuget Microsoft.SourceLink.GitHub ~> 1.1 copy_local:true +nuget DotNet.ReproducibleBuilds group Tests source https://api.nuget.org/v3/index.json diff --git a/paket.lock b/paket.lock index 44cdcbec..3892ab0f 100644 --- a/paket.lock +++ b/paket.lock @@ -2,12 +2,26 @@ STORAGE: NONE RESTRICTION: == netstandard2.0 NUGET remote: https://api.nuget.org/v3/index.json + DotNet.ReproducibleBuilds (1.1.1) + Microsoft.SourceLink.AzureRepos.Git (>= 1.1.1) + Microsoft.SourceLink.Bitbucket.Git (>= 1.1.1) + Microsoft.SourceLink.GitHub (>= 1.1.1) + Microsoft.SourceLink.GitLab (>= 1.1.1) FSharp.Core (4.3.2) - Microsoft.Build.Tasks.Git (1.1.1) - copy_local: true - Microsoft.SourceLink.Common (1.1.1) - copy_local: true - Microsoft.SourceLink.GitHub (1.1.1) - copy_local: true + Microsoft.Build.Tasks.Git (8.0) + Microsoft.SourceLink.AzureRepos.Git (8.0) + Microsoft.Build.Tasks.Git (>= 8.0) + Microsoft.SourceLink.Common (>= 8.0) + Microsoft.SourceLink.Bitbucket.Git (8.0) + Microsoft.Build.Tasks.Git (>= 8.0) + Microsoft.SourceLink.Common (>= 8.0) + Microsoft.SourceLink.Common (8.0) + Microsoft.SourceLink.GitHub (1.1.1) Microsoft.Build.Tasks.Git (>= 1.1.1) Microsoft.SourceLink.Common (>= 1.1.1) + Microsoft.SourceLink.GitLab (8.0) + Microsoft.Build.Tasks.Git (>= 8.0) + Microsoft.SourceLink.Common (>= 8.0) System.Buffers (4.5.1) System.Configuration.ConfigurationManager (4.4) System.Security.Cryptography.ProtectedData (>= 4.4) diff --git a/samples/Argu.Samples.LS/Argu.Samples.LS.fsproj b/samples/Argu.Samples.LS/Argu.Samples.LS.fsproj index 51c65256..629571c7 100644 --- a/samples/Argu.Samples.LS/Argu.Samples.LS.fsproj +++ b/samples/Argu.Samples.LS/Argu.Samples.LS.fsproj @@ -1,10 +1,9 @@ - - + net6.0 Exe ls - true + false diff --git a/src/Argu/Argu.fsproj b/src/Argu/Argu.fsproj index cdb72be2..bb17edfd 100644 --- a/src/Argu/Argu.fsproj +++ b/src/Argu/Argu.fsproj @@ -1,10 +1,8 @@ - - + netstandard2.0 true true - true logo.png @@ -24,4 +22,4 @@ - \ No newline at end of file + diff --git a/src/Argu/paket.references b/src/Argu/paket.references index 96c04807..1179a332 100644 --- a/src/Argu/paket.references +++ b/src/Argu/paket.references @@ -1,3 +1,3 @@ FSharp.Core System.Configuration.ConfigurationManager -Microsoft.SourceLink.GitHub \ No newline at end of file +DotNet.ReproducibleBuilds \ No newline at end of file diff --git a/tests/Argu.Tests/Argu.Tests.fsproj b/tests/Argu.Tests/Argu.Tests.fsproj index 23f6b654..6a4f176a 100644 --- a/tests/Argu.Tests/Argu.Tests.fsproj +++ b/tests/Argu.Tests/Argu.Tests.fsproj @@ -1,5 +1,4 @@ - - + net6.0 From 35c3211ef51efe274fe1fa258b1b5a2b53cf2b25 Mon Sep 17 00:00:00 2001 From: Ruben Bartelink Date: Tue, 28 Nov 2023 11:22:12 +0000 Subject: [PATCH 2/3] Remove packages.config --- tests/Argu.Tests/packages.config | 43 -------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 tests/Argu.Tests/packages.config diff --git a/tests/Argu.Tests/packages.config b/tests/Argu.Tests/packages.config deleted file mode 100644 index 3030d597..00000000 --- a/tests/Argu.Tests/packages.config +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 88a712a5ae347dfd59c571131abecad9bdf06e67 Mon Sep 17 00:00:00 2001 From: Ruben Bartelink Date: Wed, 13 Dec 2023 13:57:13 +0000 Subject: [PATCH 3/3] Reinstate RepositoryUrl --- Directory.Build.props | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Directory.Build.props b/Directory.Build.props index caf0895b..8f325cb9 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -10,6 +10,8 @@ Eirik Tsarpalis 2019 F#, argument, commandline, parser + + https://github.com/fsprojects/Argu/ https://fsprojects.github.io/Argu/ MIT