From 56d8a71798a9696f2a06ec2dc25666741e1359c9 Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Sun, 22 Sep 2024 16:06:00 -0500 Subject: [PATCH 1/3] convert all of the src code to NuGet/CPM --- .config/dotnet-tools.json | 42 +- .paket/Paket.Restore.targets | 557 ------------------ Directory.Build.props | 7 + Directory.Packages.props | 28 + nuget.config | 14 + paket.dependencies | 25 - src/Directory.Build.props | 2 +- .../Ionide.ProjInfo.FCS.fsproj | 7 +- src/Ionide.ProjInfo.FCS/paket.references | 4 - .../Ionide.ProjInfo.ProjectSystem.fsproj | 8 +- .../paket.references | 6 - .../Ionide.ProjInfo.Sln.csproj | 4 +- .../Ionide.ProjInfo.Tool.fsproj | 9 +- src/Ionide.ProjInfo.Tool/paket.references | 6 - src/Ionide.ProjInfo/Ionide.ProjInfo.fsproj | 8 +- src/Ionide.ProjInfo/paket.references | 6 - test/Directory.Build.props | 8 + 17 files changed, 98 insertions(+), 643 deletions(-) delete mode 100644 .paket/Paket.Restore.targets create mode 100644 Directory.Build.props create mode 100644 Directory.Packages.props create mode 100644 nuget.config delete mode 100644 src/Ionide.ProjInfo.FCS/paket.references delete mode 100644 src/Ionide.ProjInfo.ProjectSystem/paket.references delete mode 100644 src/Ionide.ProjInfo.Tool/paket.references delete mode 100644 src/Ionide.ProjInfo/paket.references create mode 100644 test/Directory.Build.props diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index aa272694..31763b12 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -1,30 +1,18 @@ { - "version": 1, - "isRoot": true, - "tools": { - "paket": { - "version": "8.0.3", - "commands": [ - "paket" - ] - }, - "fake-cli": { - "version": "6.0.0", - "commands": [ - "fake" - ] - }, - "octonav": { - "version": "0.0.1", - "commands": [ - "octonav" - ] - }, - "fantomas": { - "version": "6.1.2", - "commands": [ - "fantomas" - ] + "version": 1, + "isRoot": true, + "tools": { + "fake-cli": { + "version": "6.0.0", + "commands": [ + "fake" + ] + }, + "fantomas": { + "version": "6.1.2", + "commands": [ + "fantomas" + ] + } } - } } \ No newline at end of file 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/Directory.Build.props b/Directory.Build.props new file mode 100644 index 00000000..21aaa064 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,7 @@ + + + + + + + diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 00000000..0bcc9827 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,28 @@ + + + + true + true + false + 17.3.4 + + + + + + + + + + + + + + + + + + + + diff --git a/nuget.config b/nuget.config new file mode 100644 index 00000000..ce0a3011 --- /dev/null +++ b/nuget.config @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/paket.dependencies b/paket.dependencies index d2577f97..91282992 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -5,31 +5,6 @@ source https://api.nuget.org/v3/index.json storage: none framework: net6.0, net7.0 -nuget FSharp.Core -nuget FSharp.Compiler.Service >= 7.0.400 -nuget Argu - -# copy_local: true because this is a build-time dependency only -nuget Dotnet.ReproducibleBuilds copy_local: true -nuget GitHubActionsTestLogger -nuget Ionide.KeepAChangelog.Tasks copy_local:true - -nuget Expecto -nuget Expecto.Diff -nuget Expecto.TestResults -nuget MedallionShell ~> 1.5.0 - -# copy_local: false excludes runtime assets (desired for msbuild) -nuget Microsoft.Build copy_local: false -nuget Microsoft.Build.Framework copy_local: false -nuget Microsoft.Build.Utilities.Core copy_local: false -nuget Microsoft.Build.Tasks.Core copy_local: false -nuget Microsoft.NET.Test.Sdk -nuget Newtonsoft.Json -nuget Fsharp.Control.Reactive -nuget SemanticVersioning -nuget YoloDev.Expecto.TestSdk - // [ FAKE GROUP ] group Build source https://api.nuget.org/v3/index.json diff --git a/src/Directory.Build.props b/src/Directory.Build.props index bf9b43a5..90b38a3f 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -14,4 +14,4 @@ MSBuild evaluation, fsproj file loading, and project system for F# tooling true - \ No newline at end of file + diff --git a/src/Ionide.ProjInfo.FCS/Ionide.ProjInfo.FCS.fsproj b/src/Ionide.ProjInfo.FCS/Ionide.ProjInfo.FCS.fsproj index 20d209d6..4f5d4c44 100644 --- a/src/Ionide.ProjInfo.FCS/Ionide.ProjInfo.FCS.fsproj +++ b/src/Ionide.ProjInfo.FCS/Ionide.ProjInfo.FCS.fsproj @@ -12,5 +12,8 @@ - - \ No newline at end of file + + + + + diff --git a/src/Ionide.ProjInfo.FCS/paket.references b/src/Ionide.ProjInfo.FCS/paket.references deleted file mode 100644 index aa5a094f..00000000 --- a/src/Ionide.ProjInfo.FCS/paket.references +++ /dev/null @@ -1,4 +0,0 @@ -FSharp.Core -FSharp.Compiler.Service -Dotnet.ReproducibleBuilds -Ionide.KeepAChangelog.Tasks \ No newline at end of file diff --git a/src/Ionide.ProjInfo.ProjectSystem/Ionide.ProjInfo.ProjectSystem.fsproj b/src/Ionide.ProjInfo.ProjectSystem/Ionide.ProjInfo.ProjectSystem.fsproj index 10fdc7bc..5d3f5c7d 100644 --- a/src/Ionide.ProjInfo.ProjectSystem/Ionide.ProjInfo.ProjectSystem.fsproj +++ b/src/Ionide.ProjInfo.ProjectSystem/Ionide.ProjInfo.ProjectSystem.fsproj @@ -22,11 +22,15 @@ + + + + + <_Parameter1>Ionide.ProjInfo.Tests - - \ No newline at end of file + diff --git a/src/Ionide.ProjInfo.ProjectSystem/paket.references b/src/Ionide.ProjInfo.ProjectSystem/paket.references deleted file mode 100644 index 03c71e30..00000000 --- a/src/Ionide.ProjInfo.ProjectSystem/paket.references +++ /dev/null @@ -1,6 +0,0 @@ -FSharp.Core -FSharp.Compiler.Service -Newtonsoft.Json -Dotnet.ReproducibleBuilds -Ionide.KeepAChangelog.Tasks -Fsharp.Control.Reactive \ No newline at end of file diff --git a/src/Ionide.ProjInfo.Sln/Ionide.ProjInfo.Sln.csproj b/src/Ionide.ProjInfo.Sln/Ionide.ProjInfo.Sln.csproj index 15966cd6..eae3a8cb 100644 --- a/src/Ionide.ProjInfo.Sln/Ionide.ProjInfo.Sln.csproj +++ b/src/Ionide.ProjInfo.Sln/Ionide.ProjInfo.Sln.csproj @@ -6,6 +6,4 @@ FULL_SLN_PARSER;STANDALONEBUILD;$(DefineConstants) true - - - \ No newline at end of file + diff --git a/src/Ionide.ProjInfo.Tool/Ionide.ProjInfo.Tool.fsproj b/src/Ionide.ProjInfo.Tool/Ionide.ProjInfo.Tool.fsproj index 438210e1..145d67b8 100644 --- a/src/Ionide.ProjInfo.Tool/Ionide.ProjInfo.Tool.fsproj +++ b/src/Ionide.ProjInfo.Tool/Ionide.ProjInfo.Tool.fsproj @@ -17,5 +17,10 @@ - - \ No newline at end of file + + + + + + + diff --git a/src/Ionide.ProjInfo.Tool/paket.references b/src/Ionide.ProjInfo.Tool/paket.references deleted file mode 100644 index 98c8f2bc..00000000 --- a/src/Ionide.ProjInfo.Tool/paket.references +++ /dev/null @@ -1,6 +0,0 @@ -FSharp.Core -Argu -Microsoft.Build copy_local: true -Microsoft.Build.Framework copy_local: true -Dotnet.ReproducibleBuilds -Ionide.KeepAChangelog.Tasks \ No newline at end of file diff --git a/src/Ionide.ProjInfo/Ionide.ProjInfo.fsproj b/src/Ionide.ProjInfo/Ionide.ProjInfo.fsproj index 9fddfaa7..80f7e363 100644 --- a/src/Ionide.ProjInfo/Ionide.ProjInfo.fsproj +++ b/src/Ionide.ProjInfo/Ionide.ProjInfo.fsproj @@ -15,5 +15,9 @@ - - \ No newline at end of file + + + + + + diff --git a/src/Ionide.ProjInfo/paket.references b/src/Ionide.ProjInfo/paket.references deleted file mode 100644 index 219b7433..00000000 --- a/src/Ionide.ProjInfo/paket.references +++ /dev/null @@ -1,6 +0,0 @@ -Microsoft.Build copy_local: false -Microsoft.Build.Framework copy_local: false -FSharp.Core -Dotnet.ReproducibleBuilds -Ionide.KeepAChangelog.Tasks -SemanticVersioning \ No newline at end of file diff --git a/test/Directory.Build.props b/test/Directory.Build.props new file mode 100644 index 00000000..4457f31e --- /dev/null +++ b/test/Directory.Build.props @@ -0,0 +1,8 @@ + + + + + + + From 4ddc65a436ac309a7fd08da8dd212d5e6d068dca Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Sun, 22 Sep 2024 16:34:41 -0500 Subject: [PATCH 2/3] convert tests and build project to NuGet CPM --- .editorconfig | 10 - .gitignore | 1 - .vscode/settings.json | 1 - Directory.Packages.props | 19 +- build/build.fsproj | 10 +- build/paket.references | 13 - global.json | 10 +- nuget.config | 4 +- paket.dependencies | 27 - paket.lock | 461 ------------------ .../Ionide.ProjInfo.Tests.fsproj | 13 +- test/Ionide.ProjInfo.Tests/Program.fs | 23 +- test/Ionide.ProjInfo.Tests/paket.references | 12 - 13 files changed, 48 insertions(+), 556 deletions(-) delete mode 100644 build/paket.references delete mode 100644 paket.dependencies delete mode 100644 paket.lock delete mode 100644 test/Ionide.ProjInfo.Tests/paket.references diff --git a/.editorconfig b/.editorconfig index bc2cd779..d0574e74 100644 --- a/.editorconfig +++ b/.editorconfig @@ -55,16 +55,6 @@ end_of_line = crlf [*.{ps1, psm1}] end_of_line = crlf -# Paket files -[paket.*] -trim_trailing_whitespace = true -indent_size = 2 - -[*.paket.references] -trim_trailing_whitespace = true -indent_size = 2 - - # YAML Files [*.{yml,yaml}] indent_size = 2 diff --git a/.gitignore b/.gitignore index 10087198..d3d199fd 100644 --- a/.gitignore +++ b/.gitignore @@ -236,7 +236,6 @@ _Pvt_Extensions # Repo-specific files .dotnetsdk -/paket-files/ /test/testrun/ /test/testrun_ws/ msbuild.binlog diff --git a/.vscode/settings.json b/.vscode/settings.json index 26a4a164..a14e0795 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,6 @@ { "FSharp.excludeProjectDirectories": [ ".git", - "paket-files", "test/testrun", "test/testrun_ws", "test/testrun_ws_fcs", diff --git a/Directory.Packages.props b/Directory.Packages.props index 0bcc9827..e95c1e0c 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,10 +1,11 @@ - true true false - 17.3.4 + true + 17.3.2 + 6.1.1 @@ -13,16 +14,26 @@ - + + + + + + + + + - + + + diff --git a/build/build.fsproj b/build/build.fsproj index 1bc438bc..8db86812 100644 --- a/build/build.fsproj +++ b/build/build.fsproj @@ -8,5 +8,11 @@ - - \ No newline at end of file + + + + + + + + diff --git a/build/paket.references b/build/paket.references deleted file mode 100644 index b162c57b..00000000 --- a/build/paket.references +++ /dev/null @@ -1,13 +0,0 @@ -group Build -Fake.Core.Target -Fake.Core.Process -Fake.DotNet.Cli -Fake.Core.ReleaseNotes -Fake.DotNet.AssemblyInfoFile -Fake.DotNet.Paket -Fake.Tools.Git -Fake.Core.Environment -Fake.Core.UserInput -Fake.IO.FileSystem -Fake.DotNet.MsBuild -Fake.Api.GitHub \ No newline at end of file diff --git a/global.json b/global.json index b1cfba0a..bf4347be 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { - "sdk": { - "version": "6.0.400", - "rollForward": "latestMajor", - "allowPrerelease": true - } + "sdk": { + "version": "6.0.400", + "rollForward": "latestMajor", + "allowPrerelease": true + } } \ No newline at end of file diff --git a/nuget.config b/nuget.config index ce0a3011..6530e9c7 100644 --- a/nuget.config +++ b/nuget.config @@ -1,13 +1,11 @@ - - - + diff --git a/paket.dependencies b/paket.dependencies deleted file mode 100644 index 91282992..00000000 --- a/paket.dependencies +++ /dev/null @@ -1,27 +0,0 @@ -source https://api.nuget.org/v3/index.json -# this is the FCS nightly feed, re-enable at your own risk! -# source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json - -storage: none -framework: net6.0, net7.0 - -// [ FAKE GROUP ] -group Build - source https://api.nuget.org/v3/index.json - - framework: net6.0 - storage: none - - nuget Fake.Core.Target - nuget Fake.Core.Process - nuget Fake.DotNet.Cli - nuget Fake.Core.ReleaseNotes - nuget Fake.DotNet.AssemblyInfoFile - nuget Fake.DotNet.Paket - nuget Fake.Tools.Git - nuget Fake.Core.Environment - nuget Fake.Core.UserInput - nuget Fake.IO.FileSystem - nuget Fake.DotNet.MsBuild - nuget Fake.Api.GitHub - nuget MSBuild.StructuredLogger diff --git a/paket.lock b/paket.lock deleted file mode 100644 index 4f6dece1..00000000 --- a/paket.lock +++ /dev/null @@ -1,461 +0,0 @@ -STORAGE: NONE -RESTRICTION: || (== net6.0) (== net7.0) -NUGET - remote: https://api.nuget.org/v3/index.json - Argu (6.1.1) - FSharp.Core (>= 4.3.2) - System.Configuration.ConfigurationManager (>= 4.4) - DiffPlex (1.7.1) - DotNet.ReproducibleBuilds (1.1.1) - copy_local: true - 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) - Expecto (9.0.4) - FSharp.Core (>= 4.6) - Mono.Cecil (>= 0.11.3) - Expecto.Diff (9.0.4) - DiffPlex (>= 1.6.3) - Expecto (>= 9.0.4) - FSharp.Core (>= 4.6) - Expecto.TestResults (8.13.2) - Expecto (>= 8.13.2) - FSharp.Core (>= 4.6) - FSharp.Compiler.Service (43.8.400) - FSharp.Core (8.0.400) - System.Buffers (>= 4.5.1) - System.Collections.Immutable (>= 8.0) - System.Diagnostics.DiagnosticSource (>= 8.0) - System.Memory (>= 4.5.5) - System.Reflection.Emit (>= 4.7) - System.Reflection.Metadata (>= 8.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - FSharp.Control.Reactive (5.0.5) - FSharp.Core (>= 4.7.2) - System.Reactive (>= 5.0 < 6.0) - FSharp.Core (8.0.400) - GitHubActionsTestLogger (2.0.1) - Microsoft.TestPlatform.ObjectModel (>= 17.2) - Ionide.KeepAChangelog.Tasks (0.1.8) - copy_local: true - MedallionShell (1.5.1) - NETStandard.Library (>= 1.6) - System.Diagnostics.Process (>= 4.1) - Microsoft.Build (17.2) - copy_local: false - Microsoft.Build.Framework (>= 17.2) - Microsoft.NET.StringTools (>= 1.0) - Microsoft.Win32.Registry (>= 4.3) - System.Collections.Immutable (>= 5.0) - System.Configuration.ConfigurationManager (>= 4.7) - System.Reflection.Metadata (>= 1.6) - System.Security.Principal.Windows (>= 4.7) - System.Text.Encoding.CodePages (>= 4.0.1) - System.Text.Json (>= 6.0) - System.Threading.Tasks.Dataflow (>= 6.0) - Microsoft.Build.Framework (17.2) - copy_local: false - Microsoft.Win32.Registry (>= 4.3) - System.Security.Permissions (>= 4.7) - Microsoft.Build.Tasks.Core (17.2) - copy_local: false - Microsoft.Build.Framework (>= 17.2) - Microsoft.Build.Utilities.Core (>= 17.2) - Microsoft.NET.StringTools (>= 1.0) - Microsoft.Win32.Registry (>= 4.3) - System.CodeDom (>= 4.4) - System.Collections.Immutable (>= 5.0) - System.Reflection.Metadata (>= 1.6) - System.Resources.Extensions (>= 4.6) - System.Security.Cryptography.Pkcs (>= 4.7) - System.Security.Cryptography.Xml (>= 4.7) - System.Security.Permissions (>= 4.7) - System.Threading.Tasks.Dataflow (>= 6.0) - Microsoft.Build.Tasks.Git (1.1.1) - copy_local: true - Microsoft.Build.Utilities.Core (17.2) - copy_local: false - Microsoft.Build.Framework (>= 17.2) - Microsoft.NET.StringTools (>= 1.0) - Microsoft.Win32.Registry (>= 4.3) - System.Collections.Immutable (>= 5.0) - System.Configuration.ConfigurationManager (>= 4.7) - Microsoft.CodeCoverage (17.5) - Microsoft.NET.StringTools (1.0) - copy_local: false - System.Memory (>= 4.5.4) - System.Runtime.CompilerServices.Unsafe (>= 5.0) - Microsoft.NET.Test.Sdk (17.5) - Microsoft.CodeCoverage (>= 17.5) - Microsoft.TestPlatform.TestHost (>= 17.5) - Microsoft.NETCore.Platforms (6.0.2) - Microsoft.NETCore.Targets (5.0) - Microsoft.SourceLink.AzureRepos.Git (1.1.1) - copy_local: true - Microsoft.Build.Tasks.Git (>= 1.1.1) - Microsoft.SourceLink.Common (>= 1.1.1) - Microsoft.SourceLink.Bitbucket.Git (1.1.1) - copy_local: true - Microsoft.Build.Tasks.Git (>= 1.1.1) - Microsoft.SourceLink.Common (>= 1.1.1) - Microsoft.SourceLink.Common (1.1.1) - copy_local: true - Microsoft.SourceLink.GitHub (1.1.1) - copy_local: true - Microsoft.Build.Tasks.Git (>= 1.1.1) - Microsoft.SourceLink.Common (>= 1.1.1) - Microsoft.SourceLink.GitLab (1.1.1) - copy_local: true - Microsoft.Build.Tasks.Git (>= 1.1.1) - Microsoft.SourceLink.Common (>= 1.1.1) - Microsoft.TestPlatform.ObjectModel (17.5) - NuGet.Frameworks (>= 5.11) - System.Reflection.Metadata (>= 1.6) - Microsoft.TestPlatform.TestHost (17.5) - Microsoft.TestPlatform.ObjectModel (>= 17.5) - Newtonsoft.Json (>= 13.0.1) - Microsoft.Win32.Primitives (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - Microsoft.Win32.Registry (5.0) - copy_local: false - System.Security.AccessControl (>= 5.0) - System.Security.Principal.Windows (>= 5.0) - Microsoft.Win32.SystemEvents (6.0) - copy_local: false - Mono.Cecil (0.11.4) - NETStandard.Library (2.0.3) - Microsoft.NETCore.Platforms (>= 1.1) - Newtonsoft.Json (13.0.1) - NuGet.Frameworks (6.4) - runtime.native.System (4.3.1) - Microsoft.NETCore.Platforms (>= 1.1.1) - Microsoft.NETCore.Targets (>= 1.1.3) - SemanticVersioning (2.0.2) - System.Buffers (4.5.1) - System.CodeDom (6.0) - copy_local: false - System.Collections (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Collections.Immutable (8.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (== net6.0) (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) - System.Configuration.ConfigurationManager (6.0) - copy_local: false - System.Security.Cryptography.ProtectedData (>= 6.0) - System.Security.Permissions (>= 6.0) - System.Diagnostics.Debug (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Diagnostics.DiagnosticSource (8.0.1) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (== net6.0) (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) - System.Diagnostics.Process (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.Win32.Primitives (>= 4.3) - Microsoft.Win32.Registry (>= 4.3) - runtime.native.System (>= 4.3) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Globalization (>= 4.3) - System.IO (>= 4.3) - System.IO.FileSystem (>= 4.3) - System.IO.FileSystem.Primitives (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Runtime.InteropServices (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Text.Encoding.Extensions (>= 4.3) - System.Threading (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.Threading.Thread (>= 4.3) - System.Threading.ThreadPool (>= 4.3) - System.Drawing.Common (6.0) - copy_local: false - Microsoft.Win32.SystemEvents (>= 6.0) - System.Formats.Asn1 (6.0) - copy_local: false - System.Globalization (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.IO (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.IO.FileSystem (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.IO (>= 4.3) - System.IO.FileSystem.Primitives (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.IO.FileSystem.Primitives (4.3) - System.Runtime (>= 4.3) - System.Memory (4.5.5) - System.Reactive (5.0) - System.Reflection (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.IO (>= 4.3) - System.Reflection.Primitives (>= 4.3) - System.Runtime (>= 4.3) - System.Reflection.Emit (4.7) - System.Reflection.Metadata (8.0) - System.Collections.Immutable (>= 8.0) - System.Reflection.Primitives (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Resources.Extensions (6.0) - copy_local: false - System.Resources.ResourceManager (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Globalization (>= 4.3) - System.Reflection (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime (4.3.1) - Microsoft.NETCore.Platforms (>= 1.1.1) - Microsoft.NETCore.Targets (>= 1.1.3) - System.Runtime.CompilerServices.Unsafe (6.0) - System.Runtime.Extensions (4.3.1) - Microsoft.NETCore.Platforms (>= 1.1.1) - Microsoft.NETCore.Targets (>= 1.1.3) - System.Runtime (>= 4.3.1) - System.Runtime.Handles (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Runtime.InteropServices (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Reflection (>= 4.3) - System.Reflection.Primitives (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Security.AccessControl (6.0) - copy_local: false - System.Security.Cryptography.Pkcs (6.0) - copy_local: false - System.Formats.Asn1 (>= 6.0) - System.Security.Cryptography.ProtectedData (6.0) - copy_local: false - System.Security.Cryptography.Xml (6.0) - copy_local: false - System.Security.AccessControl (>= 6.0) - System.Security.Cryptography.Pkcs (>= 6.0) - System.Security.Permissions (6.0) - copy_local: false - System.Security.AccessControl (>= 6.0) - System.Windows.Extensions (>= 6.0) - System.Security.Principal.Windows (5.0) - copy_local: false - System.Text.Encoding (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Text.Encoding.CodePages (6.0) - copy_local: false - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Encoding.Extensions (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Text.Encodings.Web (6.0) - copy_local: false - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Json (6.0.5) - copy_local: false - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Encodings.Web (>= 6.0) - System.Threading (4.3) - System.Runtime (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.Threading.Tasks (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Threading.Tasks.Dataflow (6.0) - copy_local: false - System.Threading.Thread (4.3) - System.Runtime (>= 4.3) - System.Threading.ThreadPool (4.3) - System.Runtime (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Windows.Extensions (6.0) - copy_local: false - System.Drawing.Common (>= 6.0) - YoloDev.Expecto.TestSdk (0.13.3) - Expecto (>= 9.0 < 10.0) - FSharp.Core (>= 4.6.2) - System.Collections.Immutable (>= 6.0) - -GROUP Build -STORAGE: NONE -RESTRICTION: == net6.0 -NUGET - remote: https://api.nuget.org/v3/index.json - BlackFox.VsWhere (1.1) - FSharp.Core (>= 4.2.3) - Microsoft.Win32.Registry (>= 4.7) - Fake.Api.GitHub (5.22) - FSharp.Core (>= 6.0) - Octokit (>= 0.50) - Fake.Core.CommandLineParsing (5.22) - FParsec (>= 1.1.1) - FSharp.Core (>= 6.0) - Fake.Core.Context (5.22) - FSharp.Core (>= 6.0) - Fake.Core.Environment (5.22) - FSharp.Core (>= 6.0) - Fake.Core.FakeVar (5.22) - Fake.Core.Context (>= 5.22) - FSharp.Core (>= 6.0) - Fake.Core.Process (5.22) - Fake.Core.Environment (>= 5.22) - Fake.Core.FakeVar (>= 5.22) - Fake.Core.String (>= 5.22) - Fake.Core.Trace (>= 5.22) - Fake.IO.FileSystem (>= 5.22) - FSharp.Core (>= 6.0) - System.Collections.Immutable (>= 5.0) - Fake.Core.ReleaseNotes (5.22) - Fake.Core.SemVer (>= 5.22) - Fake.Core.String (>= 5.22) - FSharp.Core (>= 6.0) - Fake.Core.SemVer (5.22) - FSharp.Core (>= 6.0) - Fake.Core.String (5.22) - FSharp.Core (>= 6.0) - Fake.Core.Target (5.22) - Fake.Core.CommandLineParsing (>= 5.22) - Fake.Core.Context (>= 5.22) - Fake.Core.Environment (>= 5.22) - Fake.Core.FakeVar (>= 5.22) - Fake.Core.Process (>= 5.22) - Fake.Core.String (>= 5.22) - Fake.Core.Trace (>= 5.22) - FSharp.Control.Reactive (>= 5.0.2) - FSharp.Core (>= 6.0) - Fake.Core.Tasks (5.22) - Fake.Core.Trace (>= 5.22) - FSharp.Core (>= 6.0) - Fake.Core.Trace (5.22) - Fake.Core.Environment (>= 5.22) - Fake.Core.FakeVar (>= 5.22) - FSharp.Core (>= 6.0) - Fake.Core.UserInput (5.22) - FSharp.Core (>= 6.0) - Fake.Core.Xml (5.22) - Fake.Core.String (>= 5.22) - FSharp.Core (>= 6.0) - Fake.DotNet.AssemblyInfoFile (5.22) - Fake.Core.Environment (>= 5.22) - Fake.Core.String (>= 5.22) - Fake.Core.Trace (>= 5.22) - Fake.IO.FileSystem (>= 5.22) - FSharp.Core (>= 6.0) - Fake.DotNet.Cli (5.22) - Fake.Core.Environment (>= 5.22) - Fake.Core.Process (>= 5.22) - Fake.Core.String (>= 5.22) - Fake.Core.Trace (>= 5.22) - Fake.DotNet.MSBuild (>= 5.22) - Fake.DotNet.NuGet (>= 5.22) - Fake.IO.FileSystem (>= 5.22) - FSharp.Core (>= 6.0) - Mono.Posix.NETStandard (>= 1.0) - Newtonsoft.Json (>= 13.0.1) - Fake.DotNet.MSBuild (5.22) - BlackFox.VsWhere (>= 1.1) - Fake.Core.Environment (>= 5.22) - Fake.Core.Process (>= 5.22) - Fake.Core.String (>= 5.22) - Fake.Core.Trace (>= 5.22) - Fake.IO.FileSystem (>= 5.22) - FSharp.Core (>= 6.0) - MSBuild.StructuredLogger (>= 2.1.545) - Fake.DotNet.NuGet (5.22) - Fake.Core.Environment (>= 5.22) - Fake.Core.Process (>= 5.22) - Fake.Core.SemVer (>= 5.22) - Fake.Core.String (>= 5.22) - Fake.Core.Tasks (>= 5.22) - Fake.Core.Trace (>= 5.22) - Fake.Core.Xml (>= 5.22) - Fake.IO.FileSystem (>= 5.22) - Fake.Net.Http (>= 5.22) - FSharp.Core (>= 6.0) - Newtonsoft.Json (>= 13.0.1) - NuGet.Protocol (>= 5.11) - Fake.DotNet.Paket (5.22) - Fake.Core.Process (>= 5.22) - Fake.Core.String (>= 5.22) - Fake.Core.Trace (>= 5.22) - Fake.DotNet.Cli (>= 5.22) - Fake.IO.FileSystem (>= 5.22) - FSharp.Core (>= 6.0) - Fake.IO.FileSystem (5.22) - Fake.Core.String (>= 5.22) - FSharp.Core (>= 6.0) - Fake.Net.Http (5.22) - Fake.Core.Trace (>= 5.22) - FSharp.Core (>= 6.0) - Fake.Tools.Git (5.22) - Fake.Core.Environment (>= 5.22) - Fake.Core.Process (>= 5.22) - Fake.Core.SemVer (>= 5.22) - Fake.Core.String (>= 5.22) - Fake.Core.Trace (>= 5.22) - Fake.IO.FileSystem (>= 5.22) - FSharp.Core (>= 6.0) - FParsec (1.1.1) - FSharp.Core (>= 4.3.4) - FSharp.Control.Reactive (5.0.2) - FSharp.Core (>= 4.7.2) - System.Reactive (>= 5.0) - FSharp.Core (6.0.3) - Microsoft.Build.Framework (17.1) - Microsoft.Win32.Registry (>= 4.3) - System.Security.Permissions (>= 4.7) - Microsoft.Build.Utilities.Core (17.1) - Microsoft.Build.Framework (>= 17.1) - Microsoft.NET.StringTools (>= 1.0) - Microsoft.Win32.Registry (>= 4.3) - System.Collections.Immutable (>= 5.0) - System.Configuration.ConfigurationManager (>= 4.7) - System.Security.Permissions (>= 4.7) - System.Text.Encoding.CodePages (>= 4.0.1) - Microsoft.NET.StringTools (1.0) - System.Memory (>= 4.5.4) - System.Runtime.CompilerServices.Unsafe (>= 5.0) - Microsoft.Win32.Registry (5.0) - System.Security.AccessControl (>= 5.0) - System.Security.Principal.Windows (>= 5.0) - Microsoft.Win32.SystemEvents (6.0) - Mono.Posix.NETStandard (1.0) - MSBuild.StructuredLogger (2.1.768) - Microsoft.Build.Framework (>= 16.10) - Microsoft.Build.Utilities.Core (>= 16.10) - Newtonsoft.Json (13.0.1) - NuGet.Common (6.1) - NuGet.Frameworks (>= 6.1) - NuGet.Configuration (6.1) - NuGet.Common (>= 6.1) - System.Security.Cryptography.ProtectedData (>= 4.4) - NuGet.Frameworks (6.1) - NuGet.Packaging (6.1) - Newtonsoft.Json (>= 13.0.1) - NuGet.Configuration (>= 6.1) - NuGet.Versioning (>= 6.1) - System.Security.Cryptography.Cng (>= 5.0) - System.Security.Cryptography.Pkcs (>= 5.0) - NuGet.Protocol (6.1) - NuGet.Packaging (>= 6.1) - NuGet.Versioning (6.1) - Octokit (0.50) - System.Collections.Immutable (6.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Configuration.ConfigurationManager (6.0) - System.Security.Cryptography.ProtectedData (>= 6.0) - System.Security.Permissions (>= 6.0) - System.Drawing.Common (6.0) - Microsoft.Win32.SystemEvents (>= 6.0) - System.Formats.Asn1 (6.0) - System.Memory (4.5.4) - System.Reactive (5.0) - System.Runtime.CompilerServices.Unsafe (6.0) - System.Security.AccessControl (6.0) - System.Security.Cryptography.Cng (5.0) - System.Formats.Asn1 (>= 5.0) - System.Security.Cryptography.Pkcs (6.0) - System.Formats.Asn1 (>= 6.0) - System.Security.Cryptography.ProtectedData (6.0) - System.Security.Permissions (6.0) - System.Security.AccessControl (>= 6.0) - System.Windows.Extensions (>= 6.0) - System.Security.Principal.Windows (5.0) - System.Text.Encoding.CodePages (6.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Windows.Extensions (6.0) - System.Drawing.Common (>= 6.0) diff --git a/test/Ionide.ProjInfo.Tests/Ionide.ProjInfo.Tests.fsproj b/test/Ionide.ProjInfo.Tests/Ionide.ProjInfo.Tests.fsproj index 5a0d1e30..0a909808 100644 --- a/test/Ionide.ProjInfo.Tests/Ionide.ProjInfo.Tests.fsproj +++ b/test/Ionide.ProjInfo.Tests/Ionide.ProjInfo.Tests.fsproj @@ -21,6 +21,15 @@ Include="..\..\src\Ionide.ProjInfo.ProjectSystem\Ionide.ProjInfo.ProjectSystem.fsproj" /> + + + + + + + + + - - - \ No newline at end of file + diff --git a/test/Ionide.ProjInfo.Tests/Program.fs b/test/Ionide.ProjInfo.Tests/Program.fs index 094d47b0..9bb7c8b5 100644 --- a/test/Ionide.ProjInfo.Tests/Program.fs +++ b/test/Ionide.ProjInfo.Tests/Program.fs @@ -1,28 +1,23 @@ -// Learn more about F# at http://docs.microsoft.com/dotnet/fsharp - open System open Ionide.ProjInfo -open Ionide.ProjInfo.ProjectSystem - open Expecto open Expecto.Impl open Expecto.Logging +open System.Threading let toolsPath = Init.init (IO.DirectoryInfo Environment.CurrentDirectory) None [] let tests = Tests.tests toolsPath - [] let main argv = - let toolsPath = Init.init (IO.DirectoryInfo Environment.CurrentDirectory) None + let _ = Init.init (IO.DirectoryInfo Environment.CurrentDirectory) None + use cts = new CancellationTokenSource() + Console.CancelKeyPress.Add(fun _ -> cts.Cancel()) + AppDomain.CurrentDomain.ProcessExit.Add(fun _ -> cts.Cancel()) - Tests.runTestsWithArgs - { - defaultConfig with - printer = TestPrinters.summaryPrinter defaultConfig.printer - verbosity = LogLevel.Verbose - } - argv - tests + runTestsWithCLIArgsAndCancel cts.Token [ + Printer (TestPrinters.summaryPrinter defaultConfig.printer) + Verbosity Verbose + ] argv tests diff --git a/test/Ionide.ProjInfo.Tests/paket.references b/test/Ionide.ProjInfo.Tests/paket.references deleted file mode 100644 index 40fc2156..00000000 --- a/test/Ionide.ProjInfo.Tests/paket.references +++ /dev/null @@ -1,12 +0,0 @@ -FSharp.Core -Expecto -Expecto.TestResults -Expecto.Diff -MedallionShell -YoloDev.Expecto.TestSdk -FSharp.Compiler.Service -Microsoft.NET.Test.Sdk -GitHubActionsTestLogger -Microsoft.Build.Framework copy_local: false -Microsoft.Build.Utilities.Core copy_local: false -Microsoft.Build.Tasks.Core copy_local: false \ No newline at end of file From 2a0a8152a727ab9d3a1cb9e0ba70360d36b16590 Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Sun, 22 Sep 2024 16:35:25 -0500 Subject: [PATCH 3/3] remove old useless mono file --- install_mono_from_microsoft_deb_packages.sh | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100755 install_mono_from_microsoft_deb_packages.sh diff --git a/install_mono_from_microsoft_deb_packages.sh b/install_mono_from_microsoft_deb_packages.sh deleted file mode 100755 index c9c029c1..00000000 --- a/install_mono_from_microsoft_deb_packages.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash -set -euxo pipefail - -source /etc/os-release - -# required by apt-key -sudo apt install -y gnupg2 -# required by apt-update when pulling from mono-project.com -sudo apt install -y ca-certificates - -# taken from http://www.mono-project.com/download/stable/#download-lin -sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF -sudo echo "deb https://download.mono-project.com/repo/ubuntu stable-$UBUNTU_CODENAME main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list -sudo apt update -sudo apt install -y fsharp