From 0e2061d6c467d1008c2d97d5dab87b2a6b6b0212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-David=20Collin?= Date: Mon, 25 Nov 2024 15:35:34 +0100 Subject: [PATCH 01/12] update to 9.0, 8.0 untested (never worked in windows with 8.0) --- .config/dotnet-tools.json | 18 ++-- .github/workflows/build.yml | 10 +- .paket/Paket.Restore.targets | 9 +- Directory.Build.props | 4 +- paket.lock | 97 ++++++------------- .../DependencyManager.FsProj.fsproj | 2 +- src/DependencyManager.FsProj/Program.fs | 5 +- .../SomeLibWithNugetPackages.fsproj | 2 +- .../SomeLibWithProjectRefsAndNuget.fsproj | 2 +- test-projects/test-fsprojdepman.fsx | 2 +- test-projects/test-projinfo.fsx | 4 +- test/test.fsproj | 2 +- 12 files changed, 66 insertions(+), 91 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 9083f02..c3d0385 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -2,17 +2,19 @@ "version": 1, "isRoot": true, "tools": { - "paket": { - "version": "8.0.3", - "commands": [ - "paket" - ] - }, "fantomas": { - "version": "6.3.0", + "version": "6.3.16", "commands": [ "fantomas" - ] + ], + "rollForward": false + }, + "paket": { + "version": "9.0.2", + "commands": [ + "paket" + ], + "rollForward": false } } } \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ec5261b..e620900 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,9 +13,9 @@ jobs: steps: - uses: actions/checkout@v2 - name: Setup .NET - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - name: Restore dependencies run: dotnet tool restore; dotnet restore - name: Build @@ -32,13 +32,13 @@ jobs: steps: - uses: actions/checkout@v2 - name: Setup .NET - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - name: Restore tools run: dotnet tool restore - name: Publish depman-fsproj - uses: brandedoutcast/publish-nuget@v2.5.2 + uses: brandedoutcast/publish-nuget@v2.5.5 with: PROJECT_FILE_PATH: src/DependencyManager.FsProj/DependencyManager.FsProj.fsproj VERSION_FILE_PATH: ./Directory.Build.props diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets index c66062b..712cd77 100644 --- a/.paket/Paket.Restore.targets +++ b/.paket/Paket.Restore.targets @@ -235,14 +235,15 @@ $([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(',')[2]) $([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]) $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[8]) - - %(PaketReferencesFileLinesInfo.PackageVersion) + + %(PaketReferencesFileLinesInfo.PackageVersion) All runtime $(ExcludeAssets);contentFiles @@ -252,6 +253,10 @@ true + + + %(PaketReferencesFileLinesInfo.PackageVersion) + diff --git a/Directory.Build.props b/Directory.Build.props index e8efa10..11d97ea 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,11 +1,11 @@ - 0.2.9 + 0.2.10 Tomas Leko This nuget package enables loading .fsproj files in .fsx scripts. To use it install nuget package and add command line option "--compilertool:directory_containing_dependencymanager" - or if you are using ionide add the line to "FSharp.fsiExtraParameters". + or if you are using ionide add the line to "FSharp.FSIExtraInteractiveParameters" and "FSharp.FSIExtraSharedParameters". README.md LICENSE.md diff --git a/paket.lock b/paket.lock index 889c525..3704a31 100644 --- a/paket.lock +++ b/paket.lock @@ -1,58 +1,25 @@ STORAGE: NONE NUGET remote: https://www.nuget.org/api/v2 - FSharp.Core (8.0.200) + FSharp.Core (9.0.100) FSharp.SystemCommandLine (0.17.0-beta4) FSharp.Core (>= 6.0) - restriction: >= netstandard2.0 System.CommandLine (>= 2.0.0-beta4.22272.1) - restriction: >= netstandard2.0 - Ionide.ProjInfo (0.63) - FSharp.Core (>= 7.0.400) - restriction: >= net6.0 - Ionide.ProjInfo.Sln (>= 0.63) - restriction: >= net6.0 - Microsoft.Build (>= 17.2) - restriction: >= net6.0 - Microsoft.Build.Framework (>= 17.2) - restriction: >= net6.0 - SemanticVersioning (>= 2.0.2) - restriction: >= net6.0 - Ionide.ProjInfo.Sln (0.63) - restriction: >= net6.0 - Microsoft.Build (17.9.5) - restriction: >= net6.0 - Microsoft.Build.Framework (>= 17.9.5) - restriction: || (>= net472) (>= net8.0) - Microsoft.NET.StringTools (>= 17.9.5) - restriction: || (>= net472) (>= net8.0) - System.Collections.Immutable (>= 8.0) - restriction: || (>= net472) (>= net8.0) - System.Configuration.ConfigurationManager (>= 8.0) - restriction: || (>= net472) (>= net8.0) - System.Reflection.Metadata (>= 8.0) - restriction: || (>= net472) (>= net8.0) - System.Reflection.MetadataLoadContext (>= 8.0) - restriction: || (>= net472) (>= net8.0) - System.Security.Principal.Windows (>= 5.0) - restriction: || (>= net472) (>= net8.0) - System.Threading.Tasks.Dataflow (>= 8.0) - restriction: || (>= net472) (>= net8.0) - Microsoft.Build.Framework (17.9.5) - restriction: >= net6.0 - Microsoft.Win32.Registry (>= 5.0) - restriction: && (< net472) (< net8.0) (>= netstandard2.0) - System.Memory (>= 4.5.5) - restriction: && (< net472) (< net8.0) (>= netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (>= net472) (&& (< net8.0) (>= netstandard2.0)) - System.Security.Principal.Windows (>= 5.0) - restriction: && (< net472) (< net8.0) (>= netstandard2.0) - Microsoft.NET.StringTools (17.9.5) - restriction: || (&& (>= net472) (>= net6.0)) (>= net8.0) - Microsoft.Win32.Registry (5.0) - restriction: && (>= net6.0) (< net8.0) - System.Buffers (>= 4.5.1) - restriction: || (&& (>= monoandroid) (< netstandard1.3)) (>= monotouch) (&& (< net46) (< netcoreapp2.0) (>= netstandard2.0)) (>= xamarinios) (>= xamarinmac) (>= xamarintvos) (>= xamarinwatchos) - System.Security.AccessControl (>= 5.0) - restriction: || (&& (>= monoandroid) (< netstandard1.3)) (&& (< monoandroid) (>= netcoreapp2.0)) (>= monotouch) (&& (< net46) (< netcoreapp2.0) (>= netstandard2.0)) (>= net461) (>= netcoreapp2.1) (>= uap10.1) (>= xamarinios) (>= xamarinmac) (>= xamarintvos) (>= xamarinwatchos) - System.Security.Principal.Windows (>= 5.0) - restriction: || (&& (>= monoandroid) (< netstandard1.3)) (&& (< monoandroid) (>= netcoreapp2.0)) (>= monotouch) (&& (< net46) (< netcoreapp2.0) (>= netstandard2.0)) (>= net461) (>= netcoreapp2.1) (>= uap10.1) (>= xamarinios) (>= xamarinmac) (>= xamarintvos) (>= xamarinwatchos) - SemanticVersioning (2.0.2) - restriction: >= net6.0 - System.Buffers (4.5.1) - restriction: || (&& (>= monoandroid) (>= net6.0) (< netstandard1.3)) (&& (>= monotouch) (>= net6.0)) (&& (>= net6.0) (< net8.0) (>= xamarinios)) (&& (>= net6.0) (< net8.0) (>= xamarinmac)) (&& (>= net6.0) (< net8.0) (>= xamarintvos)) (&& (>= net6.0) (< net8.0) (>= xamarinwatchos)) (&& (>= net6.0) (< netcoreapp2.0)) - System.Collections.Immutable (8.0) - restriction: || (&& (>= net472) (>= net6.0)) (>= net8.0) + Ionide.ProjInfo (0.68) + FSharp.Core (>= 6.0) - restriction: >= net8.0 + Ionide.ProjInfo.Sln (>= 0.68) - restriction: >= net8.0 + SemanticVersioning (>= 2.0.2) - restriction: >= net8.0 + Ionide.ProjInfo.Sln (0.68) - restriction: >= net8.0 + SemanticVersioning (2.0.2) - restriction: >= net8.0 + System.Buffers (4.6) - restriction: || (&& (>= net462) (>= netstandard2.0)) (&& (< netcoreapp2.1) (>= netstandard2.0)) System.CommandLine (2.0.0-beta4.22272.1) - restriction: >= netstandard2.0 System.Memory (>= 4.5.4) - restriction: && (< net6.0) (>= netstandard2.0) - System.Configuration.ConfigurationManager (8.0) - restriction: || (&& (>= net472) (>= net6.0)) (>= net8.0) - System.Diagnostics.EventLog (>= 8.0) - restriction: >= net7.0 - System.Security.Cryptography.ProtectedData (>= 8.0) - restriction: || (&& (< net462) (>= netstandard2.0)) (>= net6.0) - System.Diagnostics.EventLog (8.0) - restriction: || (&& (>= net472) (>= net7.0)) (>= net8.0) - System.Memory (4.5.5) - restriction: || (&& (>= net6.0) (< net8.0)) (&& (< net6.0) (>= netstandard2.0)) - System.Buffers (>= 4.5.1) - restriction: || (&& (>= monoandroid) (< netstandard1.1)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (< netstandard1.1) (>= portable-net45+win8+wpa81) (< win8)) (>= monotouch) (&& (>= net45) (< netstandard2.0)) (&& (< net45) (< netcoreapp2.0) (>= netstandard2.0)) (>= net461) (&& (< netstandard1.1) (>= win8)) (&& (< netstandard2.0) (< uap10.1) (>= wpa81)) (>= xamarinios) (>= xamarinmac) (>= xamarintvos) (>= xamarinwatchos) - System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (>= monoandroid) (< netstandard1.1)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (>= netcoreapp2.0) (< netcoreapp2.1)) (&& (< monoandroid) (< netstandard1.1) (>= portable-net45+win8+wpa81) (< win8)) (>= monotouch) (&& (>= net45) (< netstandard2.0)) (&& (< net45) (< netcoreapp2.0) (>= netstandard2.0)) (>= net461) (&& (< netstandard1.1) (>= win8)) (&& (< netstandard2.0) (>= wpa81)) (>= uap10.1) (>= xamarinios) (>= xamarinmac) (>= xamarintvos) (>= xamarinwatchos) - System.Reflection.Metadata (8.0) - restriction: || (&& (>= net472) (>= net6.0)) (>= net8.0) - System.Collections.Immutable (>= 8.0) - restriction: || (>= net462) (>= netstandard2.0) - System.Reflection.MetadataLoadContext (8.0) - restriction: || (&& (>= net472) (>= net6.0)) (>= net8.0) - System.Collections.Immutable (>= 8.0) - restriction: || (>= net462) (>= netstandard2.0) - System.Reflection.Metadata (>= 8.0) - restriction: || (>= net462) (>= netstandard2.0) - System.Runtime.CompilerServices.Unsafe (6.0) - restriction: || (&& (>= monoandroid) (>= net6.0) (< netstandard1.1)) (&& (< monoandroid) (>= net6.0) (< netcoreapp2.1)) (&& (< monoandroid) (>= net6.0) (< netstandard1.1)) (&& (< monoandroid) (>= net6.0) (< netstandard2.0)) (&& (>= monotouch) (>= net6.0)) (&& (>= net45) (>= net6.0) (< netstandard2.0)) (&& (>= net461) (>= net6.0)) (&& (>= net472) (>= net6.0)) (&& (>= net6.0) (< net8.0)) (&& (>= net6.0) (< netcoreapp2.0)) (&& (>= net6.0) (< netstandard1.1) (>= win8)) (&& (>= net6.0) (< netstandard2.0) (>= wpa81)) (&& (>= net6.0) (>= uap10.1)) - System.Security.AccessControl (6.0) - restriction: || (&& (>= monoandroid) (>= net6.0) (< netstandard1.3)) (&& (>= monotouch) (>= net6.0)) (&& (>= net461) (>= net6.0)) (&& (>= net6.0) (< net8.0)) (&& (>= net6.0) (< netcoreapp2.0)) (&& (>= net6.0) (>= uap10.1)) - System.Security.Cryptography.ProtectedData (8.0) - restriction: || (&& (>= net472) (>= net6.0)) (>= net8.0) - System.Security.Principal.Windows (5.0) - restriction: >= net6.0 - System.Threading.Tasks.Dataflow (8.0) - restriction: || (&& (>= net472) (>= net6.0)) (>= net8.0) + System.Memory (4.6) - restriction: && (< net6.0) (>= netstandard2.0) + System.Buffers (>= 4.6) - restriction: || (>= net462) (&& (< netcoreapp2.1) (>= netstandard2.0)) + System.Numerics.Vectors (>= 4.6) - restriction: || (>= net462) (&& (< netcoreapp2.1) (>= netstandard2.0)) + System.Runtime.CompilerServices.Unsafe (>= 6.1) - restriction: || (>= net462) (&& (< netcoreapp2.1) (>= netstandard2.0)) + System.Numerics.Vectors (4.6) - restriction: || (&& (>= net462) (>= netstandard2.0)) (&& (< netcoreapp2.1) (>= netstandard2.0)) + System.Runtime.CompilerServices.Unsafe (6.1) - restriction: || (&& (>= net462) (>= netstandard2.0)) (&& (< netcoreapp2.1) (>= netstandard2.0)) GROUP Test STORAGE: NONE @@ -61,28 +28,26 @@ NUGET Expecto (10.2.1) FSharp.Core (>= 7.0.200) - restriction: >= net6.0 Mono.Cecil (>= 0.11.4 < 1.0) - restriction: >= net6.0 - FSharp.Core (8.0.200) - Microsoft.CodeCoverage (17.9) - restriction: || (>= net462) (>= netcoreapp3.1) - Microsoft.NET.Test.Sdk (17.9) - Microsoft.CodeCoverage (>= 17.9) - restriction: || (>= net462) (>= netcoreapp3.1) - Microsoft.TestPlatform.TestHost (>= 17.9) - restriction: >= netcoreapp3.1 - Microsoft.TestPlatform.ObjectModel (17.9) - restriction: >= netcoreapp3.1 + FSharp.Core (9.0.100) + Microsoft.CodeCoverage (17.12) - restriction: || (>= net462) (>= netcoreapp3.1) + Microsoft.NET.Test.Sdk (17.12) + Microsoft.CodeCoverage (>= 17.12) - restriction: || (>= net462) (>= netcoreapp3.1) + Microsoft.TestPlatform.TestHost (>= 17.12) - restriction: >= netcoreapp3.1 + Microsoft.TestPlatform.ObjectModel (17.12) - restriction: >= netcoreapp3.1 System.Reflection.Metadata (>= 1.6) - restriction: || (>= net462) (>= netstandard2.0) - Microsoft.TestPlatform.TestHost (17.9) - restriction: >= netcoreapp3.1 - Microsoft.TestPlatform.ObjectModel (>= 17.9) - restriction: >= netcoreapp3.1 + Microsoft.TestPlatform.TestHost (17.12) - restriction: >= netcoreapp3.1 + Microsoft.TestPlatform.ObjectModel (>= 17.12) - restriction: >= netcoreapp3.1 Newtonsoft.Json (>= 13.0.1) - restriction: >= netcoreapp3.1 - Mono.Cecil (0.11.5) - restriction: >= net6.0 + Mono.Cecil (0.11.6) - restriction: >= net6.0 Newtonsoft.Json (13.0.3) - restriction: >= netcoreapp3.1 - System.Buffers (4.5.1) - restriction: || (&& (>= monoandroid) (>= netcoreapp3.1) (< netstandard1.1)) (&& (< monoandroid) (>= netcoreapp3.1) (< netstandard1.1)) (&& (< monoandroid) (>= netcoreapp3.1) (< netstandard2.0)) (&& (>= monotouch) (>= netcoreapp3.1)) (&& (>= net45) (>= netcoreapp3.1) (< netstandard2.0)) (&& (>= net461) (>= netcoreapp3.1)) (&& (>= net462) (>= netcoreapp3.1)) (&& (< net6.0) (>= netcoreapp3.1) (>= xamarinios)) (&& (< net6.0) (>= netcoreapp3.1) (>= xamarinmac)) (&& (< net6.0) (>= netcoreapp3.1) (>= xamarintvos)) (&& (< net6.0) (>= netcoreapp3.1) (>= xamarinwatchos)) (&& (< netcoreapp2.0) (>= netcoreapp3.1)) (&& (>= netcoreapp3.1) (< netstandard1.1) (>= win8)) (&& (>= netcoreapp3.1) (< netstandard2.0) (>= wpa81)) - System.Collections.Immutable (8.0) - restriction: >= netcoreapp3.1 - System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (>= net462) (&& (>= net6.0) (< net7.0)) (&& (< net6.0) (>= netstandard2.0)) - System.Memory (4.5.5) - restriction: || (&& (>= net462) (>= netcoreapp3.1)) (&& (< net6.0) (>= netcoreapp3.1)) - System.Buffers (>= 4.5.1) - restriction: || (&& (>= monoandroid) (< netstandard1.1)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (< netstandard1.1) (>= portable-net45+win8+wpa81) (< win8)) (>= monotouch) (&& (>= net45) (< netstandard2.0)) (&& (< net45) (< netcoreapp2.0) (>= netstandard2.0)) (>= net461) (&& (< netstandard1.1) (>= win8)) (&& (< netstandard2.0) (< uap10.1) (>= wpa81)) (>= xamarinios) (>= xamarinmac) (>= xamarintvos) (>= xamarinwatchos) - System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (>= monoandroid) (< netstandard1.1)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (>= netcoreapp2.0) (< netcoreapp2.1)) (&& (< monoandroid) (< netstandard1.1) (>= portable-net45+win8+wpa81) (< win8)) (>= monotouch) (&& (>= net45) (< netstandard2.0)) (&& (< net45) (< netcoreapp2.0) (>= netstandard2.0)) (>= net461) (&& (< netstandard1.1) (>= win8)) (&& (< netstandard2.0) (>= wpa81)) (>= uap10.1) (>= xamarinios) (>= xamarinmac) (>= xamarintvos) (>= xamarinwatchos) - System.Reflection.Metadata (8.0) - restriction: >= netcoreapp3.1 - System.Collections.Immutable (>= 8.0) - restriction: || (>= net462) (>= netstandard2.0) - System.Memory (>= 4.5.5) - restriction: || (>= net462) (&& (< net6.0) (>= netstandard2.0)) - System.Runtime.CompilerServices.Unsafe (6.0) - restriction: || (&& (>= monoandroid) (>= netcoreapp3.1) (< netstandard1.1)) (&& (< monoandroid) (< netcoreapp2.1) (>= netcoreapp3.1)) (&& (< monoandroid) (>= netcoreapp3.1) (< netstandard1.1)) (&& (< monoandroid) (>= netcoreapp3.1) (< netstandard2.0)) (&& (>= monotouch) (>= netcoreapp3.1)) (&& (>= net45) (>= netcoreapp3.1) (< netstandard2.0)) (&& (>= net461) (>= netcoreapp3.1)) (&& (>= net462) (>= net6.0)) (&& (>= net462) (>= netcoreapp3.1)) (&& (>= net6.0) (< net7.0)) (&& (< net6.0) (>= netcoreapp3.1) (>= xamarinios)) (&& (< net6.0) (>= netcoreapp3.1) (>= xamarinmac)) (&& (< net6.0) (>= netcoreapp3.1) (>= xamarintvos)) (&& (< net6.0) (>= netcoreapp3.1) (>= xamarinwatchos)) (&& (< netcoreapp2.0) (>= netcoreapp3.1)) (&& (>= netcoreapp3.1) (< netstandard1.1) (>= win8)) (&& (>= netcoreapp3.1) (< netstandard2.0) (>= wpa81)) (&& (>= netcoreapp3.1) (>= uap10.1)) + System.Collections.Immutable (9.0) - restriction: || (&& (>= net462) (>= netcoreapp3.1)) (>= net6.0) (&& (>= net8.0) (< net9.0)) (&& (< net8.0) (>= netcoreapp3.1)) + System.Memory (>= 4.5.5) - restriction: || (>= net462) (&& (< net8.0) (>= netstandard2.0)) + System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (>= net462) (&& (< net8.0) (>= netstandard2.0)) + System.Memory (4.6) - restriction: || (&& (>= net462) (>= net6.0)) (&& (>= net462) (>= netcoreapp3.1)) (&& (>= net6.0) (< net8.0)) (&& (< net8.0) (>= netcoreapp3.1)) + System.Reflection.Metadata (9.0) - restriction: >= netcoreapp3.1 + System.Collections.Immutable (>= 9.0) - restriction: || (>= net462) (&& (>= net8.0) (< net9.0)) (&& (< net8.0) (>= netstandard2.0)) + System.Memory (>= 4.5.5) - restriction: || (>= net462) (&& (< net8.0) (>= netstandard2.0)) + System.Runtime.CompilerServices.Unsafe (6.1) - restriction: || (&& (>= net462) (>= net6.0)) (&& (>= net6.0) (< net8.0)) YoloDev.Expecto.TestSdk (0.14.3) Expecto (>= 10.0 < 11.0) - restriction: >= net6.0 FSharp.Core (>= 7.0.200) - restriction: >= net6.0 diff --git a/src/DependencyManager.FsProj/DependencyManager.FsProj.fsproj b/src/DependencyManager.FsProj/DependencyManager.FsProj.fsproj index 2b0c62f..0207818 100644 --- a/src/DependencyManager.FsProj/DependencyManager.FsProj.fsproj +++ b/src/DependencyManager.FsProj/DependencyManager.FsProj.fsproj @@ -2,7 +2,7 @@ depman-fsproj - net6.0;net7.0;net8.0 + net8.0;net9.0 Exe true depman-fsproj diff --git a/src/DependencyManager.FsProj/Program.fs b/src/DependencyManager.FsProj/Program.fs index fcc0d75..82e62d3 100644 --- a/src/DependencyManager.FsProj/Program.fs +++ b/src/DependencyManager.FsProj/Program.fs @@ -23,7 +23,10 @@ let showUsage () = $"dotnet fsi --compilertool:{installDir} " "" "To use as DependencyManager with ionide add following to your .vscode/settings.json:" - "\"FSharp.fsiExtraParameters\": [" + "\"FSharp.FSIExtraInteractiveParameters\": [" + $" \"--compilertool:{jsonFriendlyInstallDir}\"" + "]," + "\"FSharp.FSIExtraSharedParameters\": [" $" \"--compilertool:{jsonFriendlyInstallDir}\"" "]" ] diff --git a/test-projects/SomeLibWithNugetPackages/SomeLibWithNugetPackages.fsproj b/test-projects/SomeLibWithNugetPackages/SomeLibWithNugetPackages.fsproj index ab9ae7e..89c0768 100644 --- a/test-projects/SomeLibWithNugetPackages/SomeLibWithNugetPackages.fsproj +++ b/test-projects/SomeLibWithNugetPackages/SomeLibWithNugetPackages.fsproj @@ -1,7 +1,7 @@  - net6.0 + net9.0 true diff --git a/test-projects/SomeLibWithProjectRefsAndNuget/SomeLibWithProjectRefsAndNuget.fsproj b/test-projects/SomeLibWithProjectRefsAndNuget/SomeLibWithProjectRefsAndNuget.fsproj index abbf0b7..6a080b6 100644 --- a/test-projects/SomeLibWithProjectRefsAndNuget/SomeLibWithProjectRefsAndNuget.fsproj +++ b/test-projects/SomeLibWithProjectRefsAndNuget/SomeLibWithProjectRefsAndNuget.fsproj @@ -1,7 +1,7 @@  - net6.0 + net9.0 true diff --git a/test-projects/test-fsprojdepman.fsx b/test-projects/test-fsprojdepman.fsx index afcb23a..9b9630f 100644 --- a/test-projects/test-fsprojdepman.fsx +++ b/test-projects/test-fsprojdepman.fsx @@ -1,4 +1,4 @@ -#I "../src/DependencyManager.FsProj/bin/Debug/net8.0" +#I "../src/DependencyManager.FsProj/bin/Debug/net9.0" #r "DependencyManager.FsProj.dll" open System.IO diff --git a/test-projects/test-projinfo.fsx b/test-projects/test-projinfo.fsx index 16ac04b..f0cd3b2 100644 --- a/test-projects/test-projinfo.fsx +++ b/test-projects/test-projinfo.fsx @@ -1,5 +1,5 @@ -#r "nuget: Ionide.ProjInfo, 0.55.4" -#r "nuget: Ionide.ProjInfo.ProjectSystem, 0.55.4" +#r "nuget: Ionide.ProjInfo, 0.68" +#r "nuget: Ionide.ProjInfo.ProjectSystem, 0.68" open System open System.IO diff --git a/test/test.fsproj b/test/test.fsproj index fd2b2d5..389ebe0 100644 --- a/test/test.fsproj +++ b/test/test.fsproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 false From 97925d1ff58d1dcb71655f3aa54add4602074c26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-David=20Collin?= Date: Mon, 25 Nov 2024 15:41:27 +0100 Subject: [PATCH 02/12] action tag --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e620900..e0ca368 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,7 +38,7 @@ jobs: - name: Restore tools run: dotnet tool restore - name: Publish depman-fsproj - uses: brandedoutcast/publish-nuget@v2.5.5 + uses: brandedoutcast/publish-nuget@v2 with: PROJECT_FILE_PATH: src/DependencyManager.FsProj/DependencyManager.FsProj.fsproj VERSION_FILE_PATH: ./Directory.Build.props From ae4c071f85f910b0cba54b98111dca20226c9b96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-David=20Collin?= Date: Mon, 25 Nov 2024 15:42:56 +0100 Subject: [PATCH 03/12] dotnet tool bug with fantomas --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e0ca368..62bec23 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 9.0.x + dotnet-version: 9.0.101 - name: Restore dependencies run: dotnet tool restore; dotnet restore - name: Build @@ -34,7 +34,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 9.0.x + dotnet-version: 9.0.101 - name: Restore tools run: dotnet tool restore - name: Publish depman-fsproj From 7103ef6ff0764767ec559b50a2f883cc2219dd8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-David=20Collin?= Date: Mon, 25 Nov 2024 15:44:51 +0100 Subject: [PATCH 04/12] revert to 9.0.x and remove fantomas (uneeded) --- .config/dotnet-tools.json | 7 ------- .github/workflows/build.yml | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index c3d0385..3d9abb1 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -2,13 +2,6 @@ "version": 1, "isRoot": true, "tools": { - "fantomas": { - "version": "6.3.16", - "commands": [ - "fantomas" - ], - "rollForward": false - }, "paket": { "version": "9.0.2", "commands": [ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 62bec23..e0ca368 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 9.0.101 + dotnet-version: 9.0.x - name: Restore dependencies run: dotnet tool restore; dotnet restore - name: Build @@ -34,7 +34,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 9.0.101 + dotnet-version: 9.0.x - name: Restore tools run: dotnet tool restore - name: Publish depman-fsproj From 610401fe59d2a303b8414ee5584fe66b1a3e6bf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-David=20Collin?= Date: Mon, 25 Nov 2024 15:49:04 +0100 Subject: [PATCH 05/12] action version --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e0ca368..bdc396f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup .NET uses: actions/setup-dotnet@v4 with: @@ -30,7 +30,7 @@ jobs: if: startsWith(github.ref, 'refs/tags/v') steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup .NET uses: actions/setup-dotnet@v4 with: From 815c45349dd2df7b73f1b4c484dca6d930bca184 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-David=20Collin?= Date: Fri, 14 Feb 2025 20:31:54 +0100 Subject: [PATCH 06/12] reverted to 2.10 --- .vscode/settings.json | 3 --- publish-locally.ps1 | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 0f5abfa..cdfef77 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,4 @@ { - "FSharp.fsiExtraParameters": [ - "--compilertool:C:/Users/leko.tomas/source/DependencyManager.FsProj/.depman-fsproj/.store/depman-fsproj/0.2.8/depman-fsproj/0.2.8/tools/net8.0/any" - ], "yaml.schemas": { "https://json.schemastore.org/github-workflow.json": ".github/workflows/build.yml" }, diff --git a/publish-locally.ps1 b/publish-locally.ps1 index d1d31a1..8e849b0 100644 --- a/publish-locally.ps1 +++ b/publish-locally.ps1 @@ -1,4 +1,4 @@ -[xml]$buildProps = Get-Content -Path ".\Directory.Build.props" +[xml]$buildProps = Get-Content -Path "Directory.Build.props" $version = $buildProps.Project.PropertyGroup.Version $nupkg=".nupkg" $toolPath=".depman-fsproj" @@ -6,4 +6,4 @@ Remove-Item -Recurse -ErrorAction SilentlyContinue $nupkg Remove-Item -Recurse -ErrorAction SilentlyContinue $toolPath dotnet pack -o $nupkg dotnet tool install --tool-path $toolPath --add-source $nupkg --ignore-failed-sources --version $version depman-fsproj -& $toolPath\depman-fsproj.exe \ No newline at end of file +& $toolPath/depman-fsproj \ No newline at end of file From ffb44703a0edb4185398fe3290d04a17c4c03289 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-David=20Collin?= Date: Mon, 10 Mar 2025 10:18:44 +0100 Subject: [PATCH 07/12] update packages, proper attribution for the original authors --- Directory.Build.props | 4 +-- README.md | 9 ++++--- paket.lock | 62 ++++++++++++++++++++++++++----------------- 3 files changed, 45 insertions(+), 30 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 11d97ea..a28fac8 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ - 0.2.10 - Tomas Leko + 0.2.11 + Florian Verdonck, Krzysztof Cieslak, Tomas Leko, François-David Collin This nuget package enables loading .fsproj files in .fsx scripts. To use it install nuget package and add command line option "--compilertool:directory_containing_dependencymanager" diff --git a/README.md b/README.md index 4a6ebed..457d2e6 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,10 @@ +> [!NOTE] +> This is almost entirely based on the work of [Ionide](https://github.com/ionide/DependencyManager.FsProj) and the supsequent fork of [Thonas Leko](https://github.com/ThisFunctionalTom/DependencyManager.FsProj). I’ve updated some things there and there to run on the latest .NET Core SDK and [Ionide.ProjInfo](https://github.com/ionide/proj-info). I personally daily drive this tool for development purposes. + # DependencyManager.FsProj -This nuget package enables loading `.fsproj` files in `.fsx` scripts. -It extends `#r` syntax with `fsproj` dependency manager, so you can do `#r "fsproj: PATH_TO_FSPROJ.fsproj"` and it will load all references and files from the project. +This NuGet package enables loading `.fsproj` files in `.fsx` scripts. +It extends `#r` syntax with `fsproj` dependency manager, so you can do `#r "fsproj: PATH_TO_FSPROJ.fsproj"`, and it will load all references and files from the project. Sample: @@ -27,7 +30,7 @@ Run `dotnet tool install --global depman-fsproj` and once it is installed run `d *Imposter syndrome disclaimer*: I want your help. No really, I do. -There might be a little voice inside that tells you you're not ready; that you need to do one more tutorial, or learn another framework, or write a few more blog posts before you can help me with this project. +There might be a little voice inside that tells you're not ready; that you need to do one more tutorial, or learn another framework, or write a few more blog posts before you can help me with this project. I assure you, that's not the case. diff --git a/paket.lock b/paket.lock index 3704a31..c0cf7c5 100644 --- a/paket.lock +++ b/paket.lock @@ -1,15 +1,15 @@ STORAGE: NONE NUGET remote: https://www.nuget.org/api/v2 - FSharp.Core (9.0.100) + FSharp.Core (9.0.201) FSharp.SystemCommandLine (0.17.0-beta4) FSharp.Core (>= 6.0) - restriction: >= netstandard2.0 System.CommandLine (>= 2.0.0-beta4.22272.1) - restriction: >= netstandard2.0 - Ionide.ProjInfo (0.68) + Ionide.ProjInfo (0.70.2) FSharp.Core (>= 6.0) - restriction: >= net8.0 - Ionide.ProjInfo.Sln (>= 0.68) - restriction: >= net8.0 + Microsoft.VisualStudio.SolutionPersistence (>= 1.0.28) - restriction: >= net8.0 SemanticVersioning (>= 2.0.2) - restriction: >= net8.0 - Ionide.ProjInfo.Sln (0.68) - restriction: >= net8.0 + Microsoft.VisualStudio.SolutionPersistence (1.0.52) - restriction: >= net8.0 SemanticVersioning (2.0.2) - restriction: >= net8.0 System.Buffers (4.6) - restriction: || (&& (>= net462) (>= netstandard2.0)) (&& (< netcoreapp2.1) (>= netstandard2.0)) System.CommandLine (2.0.0-beta4.22272.1) - restriction: >= netstandard2.0 @@ -25,30 +25,42 @@ GROUP Test STORAGE: NONE NUGET remote: https://www.nuget.org/api/v2 - Expecto (10.2.1) + Expecto (10.2.2) FSharp.Core (>= 7.0.200) - restriction: >= net6.0 Mono.Cecil (>= 0.11.4 < 1.0) - restriction: >= net6.0 - FSharp.Core (9.0.100) - Microsoft.CodeCoverage (17.12) - restriction: || (>= net462) (>= netcoreapp3.1) - Microsoft.NET.Test.Sdk (17.12) - Microsoft.CodeCoverage (>= 17.12) - restriction: || (>= net462) (>= netcoreapp3.1) - Microsoft.TestPlatform.TestHost (>= 17.12) - restriction: >= netcoreapp3.1 - Microsoft.TestPlatform.ObjectModel (17.12) - restriction: >= netcoreapp3.1 + FSharp.Core (9.0.201) + Microsoft.ApplicationInsights (2.23) - restriction: >= net8.0 + System.Diagnostics.DiagnosticSource (>= 5.0) - restriction: || (&& (>= net452) (< netstandard2.0)) (&& (< net452) (>= netstandard2.0)) (>= net46) + Microsoft.CodeCoverage (17.13) - restriction: || (>= net462) (>= netcoreapp3.1) + Microsoft.NET.Test.Sdk (17.13) + Microsoft.CodeCoverage (>= 17.13) - restriction: || (>= net462) (>= netcoreapp3.1) + Microsoft.TestPlatform.TestHost (>= 17.13) - restriction: >= netcoreapp3.1 + Microsoft.Testing.Extensions.Telemetry (1.6.2) - restriction: >= net8.0 + Microsoft.ApplicationInsights (>= 2.22) - restriction: >= netstandard2.0 + Microsoft.Testing.Platform (>= 1.6.2) - restriction: >= netstandard2.0 + Microsoft.Testing.Extensions.TrxReport.Abstractions (1.6.2) - restriction: >= net8.0 + Microsoft.Testing.Platform (>= 1.6.2) - restriction: >= netstandard2.0 + Microsoft.Testing.Extensions.VSTestBridge (1.6.2) - restriction: >= net8.0 + Microsoft.Testing.Extensions.Telemetry (>= 1.6.2) - restriction: >= netstandard2.0 + Microsoft.Testing.Extensions.TrxReport.Abstractions (>= 1.6.2) - restriction: >= netstandard2.0 + Microsoft.Testing.Platform (>= 1.6.2) - restriction: >= netstandard2.0 + Microsoft.TestPlatform.ObjectModel (>= 17.13) - restriction: >= netstandard2.0 + Microsoft.Testing.Platform (1.6.2) - restriction: >= net8.0 + Microsoft.Testing.Platform.MSBuild (1.6.2) - restriction: >= net8.0 + Microsoft.Testing.Platform (>= 1.6.2) - restriction: >= netstandard2.0 + Microsoft.TestPlatform.ObjectModel (17.13) - restriction: >= netcoreapp3.1 System.Reflection.Metadata (>= 1.6) - restriction: || (>= net462) (>= netstandard2.0) - Microsoft.TestPlatform.TestHost (17.12) - restriction: >= netcoreapp3.1 - Microsoft.TestPlatform.ObjectModel (>= 17.12) - restriction: >= netcoreapp3.1 + Microsoft.TestPlatform.TestHost (17.13) - restriction: >= netcoreapp3.1 + Microsoft.TestPlatform.ObjectModel (>= 17.13) - restriction: >= netcoreapp3.1 Newtonsoft.Json (>= 13.0.1) - restriction: >= netcoreapp3.1 Mono.Cecil (0.11.6) - restriction: >= net6.0 Newtonsoft.Json (13.0.3) - restriction: >= netcoreapp3.1 - System.Collections.Immutable (9.0) - restriction: || (&& (>= net462) (>= netcoreapp3.1)) (>= net6.0) (&& (>= net8.0) (< net9.0)) (&& (< net8.0) (>= netcoreapp3.1)) - System.Memory (>= 4.5.5) - restriction: || (>= net462) (&& (< net8.0) (>= netstandard2.0)) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (>= net462) (&& (< net8.0) (>= netstandard2.0)) - System.Memory (4.6) - restriction: || (&& (>= net462) (>= net6.0)) (&& (>= net462) (>= netcoreapp3.1)) (&& (>= net6.0) (< net8.0)) (&& (< net8.0) (>= netcoreapp3.1)) - System.Reflection.Metadata (9.0) - restriction: >= netcoreapp3.1 - System.Collections.Immutable (>= 9.0) - restriction: || (>= net462) (&& (>= net8.0) (< net9.0)) (&& (< net8.0) (>= netstandard2.0)) - System.Memory (>= 4.5.5) - restriction: || (>= net462) (&& (< net8.0) (>= netstandard2.0)) - System.Runtime.CompilerServices.Unsafe (6.1) - restriction: || (&& (>= net462) (>= net6.0)) (&& (>= net6.0) (< net8.0)) - YoloDev.Expecto.TestSdk (0.14.3) - Expecto (>= 10.0 < 11.0) - restriction: >= net6.0 - FSharp.Core (>= 7.0.200) - restriction: >= net6.0 - System.Collections.Immutable (>= 6.0) - restriction: >= net6.0 + System.Collections.Immutable (9.0.2) - restriction: || (&& (>= net462) (>= net8.0)) (&& (>= net8.0) (< net9.0)) + System.Diagnostics.DiagnosticSource (9.0.2) - restriction: >= net8.0 + System.Reflection.Metadata (9.0.2) - restriction: >= net8.0 + System.Collections.Immutable (>= 9.0.2) - restriction: || (>= net462) (&& (>= net8.0) (< net9.0)) (&& (< net8.0) (>= netstandard2.0)) + YoloDev.Expecto.TestSdk (0.15.3) + Expecto (>= 10.2.2 < 11.0) - restriction: >= net8.0 + FSharp.Core (>= 7.0.200) - restriction: >= net8.0 + Microsoft.Testing.Extensions.VSTestBridge (>= 1.6.2) - restriction: >= net8.0 + Microsoft.Testing.Platform.MSBuild (>= 1.6.2) - restriction: >= net8.0 From 2a12521a7eec4116cf089c813df2c4de8d38f531 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-David=20Collin?= Date: Mon, 10 Mar 2025 10:56:29 +0100 Subject: [PATCH 08/12] standard actions --- .github/workflows/build.yml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bdc396f..70eefe9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,15 +7,15 @@ on: jobs: build: - runs-on: ubuntu-latest - steps: - uses: actions/checkout@v4 - name: Setup .NET - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v3 with: - dotnet-version: 9.0.x + dotnet-version: | + 9.0.x + 8.0.x - name: Restore dependencies run: dotnet tool restore; dotnet restore - name: Build @@ -24,7 +24,6 @@ jobs: run: dotnet test --no-build --verbosity normal publish: - runs-on: ubuntu-latest needs: build if: startsWith(github.ref, 'refs/tags/v') @@ -32,14 +31,16 @@ jobs: steps: - uses: actions/checkout@v4 - name: Setup .NET - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v3 with: dotnet-version: 9.0.x - name: Restore tools run: dotnet tool restore - - name: Publish depman-fsproj - uses: brandedoutcast/publish-nuget@v2 - with: - PROJECT_FILE_PATH: src/DependencyManager.FsProj/DependencyManager.FsProj.fsproj - VERSION_FILE_PATH: ./Directory.Build.props - NUGET_KEY: ${{secrets.NUGET_API_KEY}} + - name: Restore dependencies + run: dotnet restore + - name: Build + run: dotnet build src/DependencyManager.FsProj/DependencyManager.FsProj.fsproj -c Release --no-restore + - name: Pack + run: dotnet pack src/DependencyManager.FsProj/DependencyManager.FsProj.fsproj -c Release -o nuget-packages --no-build + - name: Publish NuGet package + run: dotnet nuget push nuget-packages/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate \ No newline at end of file From 6ab7b560ccb65618822a5ee3796797e4a8d1cd96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-David=20Collin?= Date: Mon, 10 Mar 2025 11:21:00 +0100 Subject: [PATCH 09/12] renamed tool to fradav.depman-fsproj --- .gitignore | 2 +- README.md | 14 +++++++++----- docs/README.md | 17 ----------------- publish-locally.ps1 | 6 +++--- .../DependencyManager.FsProj.fsproj | 4 ++-- 5 files changed, 15 insertions(+), 28 deletions(-) delete mode 100644 docs/README.md diff --git a/.gitignore b/.gitignore index 6fee278..c766582 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,5 @@ paket-files .DS_Store .idea/ .fake -.depman-fsproj/ +.fradav.depman-proj/ .nupkg/ \ No newline at end of file diff --git a/README.md b/README.md index 457d2e6..5c7a124 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ +[![NuGet Package](https://img.shields.io/nuget/v/fradav.depman-proj.svg)](https://www.nuget.org/packages/fradav.depman-proj/) +[![GitHub Actions Status](https://github.com/fradav/DependencyManager.FsProj/actions/workflows/build.yml/badge.svg)](https://github.com/fradav/DependencyManager.FsProj/actions) + + > [!NOTE] -> This is almost entirely based on the work of [Ionide](https://github.com/ionide/DependencyManager.FsProj) and the supsequent fork of [Thonas Leko](https://github.com/ThisFunctionalTom/DependencyManager.FsProj). I’ve updated some things there and there to run on the latest .NET Core SDK and [Ionide.ProjInfo](https://github.com/ionide/proj-info). I personally daily drive this tool for development purposes. +> This is almost entirely based on the work of [Ionide](https://github.com/ionide/DependencyManager.FsProj) and the subsequent fork of [Thomas Leko](https://github.com/ThisFunctionalTom/DependencyManager.FsProj). I've updated some things there and there to run on the latest .NET Core SDK (9.0.x) and [Ionide.ProjInfo](https://github.com/ionide/proj-info). I personally daily drive this tool for development purposes. # DependencyManager.FsProj @@ -17,7 +21,7 @@ printfn "RESULT: %s" t ## Installation -Run `dotnet tool install --global depman-fsproj` and once it is installed run `depman-fsproj` for instructions. +Run `dotnet tool install --global fradav.depman-proj` and once it is installed run `fradav.depman-proj` for instructions. ## Build locally @@ -34,7 +38,7 @@ There might be a little voice inside that tells you're not ready; that you need I assure you, that's not the case. -This project has some clear Contribution Guidelines and expectations that you can [read here](https://github.com/ThisFunctionalTom/DependencyManager.FsProj/blob/master/CONTRIBUTING.md). +This project has some clear Contribution Guidelines and expectations that you can [read here](https://github.com/fradav/DependencyManager.FsProj/blob/master/CONTRIBUTING.md). The contribution guidelines outline the process that you'll need to follow to get a patch merged. By making expectations and process explicit, I hope it will make it easier for you to contribute. @@ -44,9 +48,9 @@ Thank you for contributing! ## Contributing and copyright -The project is hosted on [GitHub](https://github.com/ThisFunctionalTom/DependencyManager.FsProj) where you can [report issues](https://github.com/ThisFunctionalTom/DependencyManager.FsProj/issues), fork +The project is hosted on [GitHub](https://github.com/fradav/DependencyManager.FsProj) where you can [report issues](https://github.com/fradav/DependencyManager.FsProj/issues), fork the project and submit pull requests. -The library is available under [MIT license](https://github.com/ThisFunctionalTom/DependencyManager.FsProj/blob/master/LICENSE.md), which allows modification and redistribution for both commercial and non-commercial purposes. +The library is available under [MIT license](https://github.com/fradav/DependencyManager.FsProj/blob/master/LICENSE.md), which allows modification and redistribution for both commercial and non-commercial purposes. Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms. diff --git a/docs/README.md b/docs/README.md deleted file mode 100644 index 716c8be..0000000 --- a/docs/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# DependencyManager.FsProj - -This nuget package enables loading `.fsproj` files in `.fsx` scripts. -It extends `#r` syntax with `fsproj` dependency manager, so you can do `#r "fsproj: PATH_TO_FSPROJ.fsproj"` and it will load all references and files from the project. - -Sample: - -```fsharp -#r "fsproj: ./test/test.fsproj" - -let t = test.Say.hello "Chris" -printfn "RESULT: %s" t -``` - -## Installation - -Run `dotnet tool install --global depman-fsproj` and once it is installed run `depman-fsproj` for instructions. diff --git a/publish-locally.ps1 b/publish-locally.ps1 index 8e849b0..1c7b672 100644 --- a/publish-locally.ps1 +++ b/publish-locally.ps1 @@ -1,9 +1,9 @@ [xml]$buildProps = Get-Content -Path "Directory.Build.props" $version = $buildProps.Project.PropertyGroup.Version $nupkg=".nupkg" -$toolPath=".depman-fsproj" +$toolPath=".fradav.depman-proj" Remove-Item -Recurse -ErrorAction SilentlyContinue $nupkg Remove-Item -Recurse -ErrorAction SilentlyContinue $toolPath dotnet pack -o $nupkg -dotnet tool install --tool-path $toolPath --add-source $nupkg --ignore-failed-sources --version $version depman-fsproj -& $toolPath/depman-fsproj \ No newline at end of file +dotnet tool install --tool-path $toolPath --add-source $nupkg --ignore-failed-sources --version $version fradav.depman-proj +& $toolPath/fradav.depman-proj \ No newline at end of file diff --git a/src/DependencyManager.FsProj/DependencyManager.FsProj.fsproj b/src/DependencyManager.FsProj/DependencyManager.FsProj.fsproj index 0207818..54e351c 100644 --- a/src/DependencyManager.FsProj/DependencyManager.FsProj.fsproj +++ b/src/DependencyManager.FsProj/DependencyManager.FsProj.fsproj @@ -1,11 +1,11 @@  - depman-fsproj + fradav.depman-proj net8.0;net9.0 Exe true - depman-fsproj + fradav.depman-proj From 31e68ec7afb57ef65327740946c2c4714e56dc5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-David=20Collin?= Date: Mon, 10 Mar 2025 11:40:04 +0100 Subject: [PATCH 10/12] wrong doc file in fsproj --- src/DependencyManager.FsProj/DependencyManager.FsProj.fsproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DependencyManager.FsProj/DependencyManager.FsProj.fsproj b/src/DependencyManager.FsProj/DependencyManager.FsProj.fsproj index 54e351c..c88f645 100644 --- a/src/DependencyManager.FsProj/DependencyManager.FsProj.fsproj +++ b/src/DependencyManager.FsProj/DependencyManager.FsProj.fsproj @@ -13,7 +13,7 @@ - + From 1f9e3939697e792fbd0ca3a0f42e07a5248e2187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-David=20Collin?= Date: Wed, 12 Mar 2025 16:28:13 +0100 Subject: [PATCH 11/12] - reverted the name to `depman-fsproj` - simplified a bit of the workflow --- .github/workflows/build.yml | 29 ++++--------------- .gitignore | 2 +- README.md | 4 +-- publish-locally.ps1 | 6 ++-- .../DependencyManager.FsProj.fsproj | 4 +-- 5 files changed, 14 insertions(+), 31 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 70eefe9..4cdbdaa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,28 +19,11 @@ jobs: - name: Restore dependencies run: dotnet tool restore; dotnet restore - name: Build - run: dotnet build --no-restore + run: dotnet build -c Release --no-restore - name: Test run: dotnet test --no-build --verbosity normal - - publish: - runs-on: ubuntu-latest - needs: build - if: startsWith(github.ref, 'refs/tags/v') - - steps: - - uses: actions/checkout@v4 - - name: Setup .NET - uses: actions/setup-dotnet@v3 - with: - dotnet-version: 9.0.x - - name: Restore tools - run: dotnet tool restore - - name: Restore dependencies - run: dotnet restore - - name: Build - run: dotnet build src/DependencyManager.FsProj/DependencyManager.FsProj.fsproj -c Release --no-restore - - name: Pack - run: dotnet pack src/DependencyManager.FsProj/DependencyManager.FsProj.fsproj -c Release -o nuget-packages --no-build - - name: Publish NuGet package - run: dotnet nuget push nuget-packages/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate \ No newline at end of file + - name : Publish if tag present + if: startsWith(github.ref, 'refs/tags/v') + run: | + dotnet pack -c Release -o nuget-packages --no-build + dotnet nuget push nuget-packages/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate diff --git a/.gitignore b/.gitignore index c766582..6fee278 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,5 @@ paket-files .DS_Store .idea/ .fake -.fradav.depman-proj/ +.depman-fsproj/ .nupkg/ \ No newline at end of file diff --git a/README.md b/README.md index 5c7a124..35116e8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![NuGet Package](https://img.shields.io/nuget/v/fradav.depman-proj.svg)](https://www.nuget.org/packages/fradav.depman-proj/) +[![NuGet Package](https://img.shields.io/nuget/v/depman-fsproj.svg)](https://www.nuget.org/packages/depman-fsproj/) [![GitHub Actions Status](https://github.com/fradav/DependencyManager.FsProj/actions/workflows/build.yml/badge.svg)](https://github.com/fradav/DependencyManager.FsProj/actions) @@ -21,7 +21,7 @@ printfn "RESULT: %s" t ## Installation -Run `dotnet tool install --global fradav.depman-proj` and once it is installed run `fradav.depman-proj` for instructions. +Run `dotnet tool install --global depman-fsproj` and once it is installed run `depman-fsproj` for instructions. ## Build locally diff --git a/publish-locally.ps1 b/publish-locally.ps1 index 1c7b672..8e849b0 100644 --- a/publish-locally.ps1 +++ b/publish-locally.ps1 @@ -1,9 +1,9 @@ [xml]$buildProps = Get-Content -Path "Directory.Build.props" $version = $buildProps.Project.PropertyGroup.Version $nupkg=".nupkg" -$toolPath=".fradav.depman-proj" +$toolPath=".depman-fsproj" Remove-Item -Recurse -ErrorAction SilentlyContinue $nupkg Remove-Item -Recurse -ErrorAction SilentlyContinue $toolPath dotnet pack -o $nupkg -dotnet tool install --tool-path $toolPath --add-source $nupkg --ignore-failed-sources --version $version fradav.depman-proj -& $toolPath/fradav.depman-proj \ No newline at end of file +dotnet tool install --tool-path $toolPath --add-source $nupkg --ignore-failed-sources --version $version depman-fsproj +& $toolPath/depman-fsproj \ No newline at end of file diff --git a/src/DependencyManager.FsProj/DependencyManager.FsProj.fsproj b/src/DependencyManager.FsProj/DependencyManager.FsProj.fsproj index c88f645..1ad6c0f 100644 --- a/src/DependencyManager.FsProj/DependencyManager.FsProj.fsproj +++ b/src/DependencyManager.FsProj/DependencyManager.FsProj.fsproj @@ -1,11 +1,11 @@  - fradav.depman-proj + depman-fsproj net8.0;net9.0 Exe true - fradav.depman-proj + depman-fsproj From 6de561fd6b745c95473b9b69c4a59affd7d446f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-David=20Collin?= Date: Wed, 12 Mar 2025 16:35:51 +0100 Subject: [PATCH 12/12] misaligned config for test --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4cdbdaa..a948191 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,11 +18,11 @@ jobs: 8.0.x - name: Restore dependencies run: dotnet tool restore; dotnet restore - - name: Build - run: dotnet build -c Release --no-restore - - name: Test - run: dotnet test --no-build --verbosity normal - - name : Publish if tag present + - name: Build and test + run: | + dotnet build --no-restore + dotnet test --no-build --verbosity normal + - name : Pack and Publish if tag present if: startsWith(github.ref, 'refs/tags/v') run: | dotnet pack -c Release -o nuget-packages --no-build