From 5af82acece13628155759c342c68153ce70b40cb Mon Sep 17 00:00:00 2001 From: Don Syme Date: Sun, 20 Mar 2022 03:51:31 +1000 Subject: [PATCH] update to net6 (#133) --- .config/dotnet-tools.json | 4 +- .github/workflows/build.yml | 2 +- .github/workflows/publish.yml | 2 +- .vscode/launch.json | 6 +- CHANGELOG.md | 6 + global.json | 2 +- paket.dependencies | 4 +- paket.lock | 512 +++++++++--------- .../Ionide.ProjInfo.FCS.fsproj | 2 +- .../Ionide.ProjInfo.ProjectSystem.fsproj | 2 +- .../Ionide.ProjInfo.Sln.csproj | 2 +- .../Ionide.ProjInfo.Tool.fsproj | 2 +- src/Ionide.ProjInfo/Ionide.ProjInfo.fsproj | 2 +- .../Ionide.ProjInfo.Tests.fsproj | 2 +- test/Ionide.ProjInfo.Tests/Tests.fs | 8 +- 15 files changed, 282 insertions(+), 276 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 8393033d..f559a66f 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,13 +3,13 @@ "isRoot": true, "tools": { "paket": { - "version": "6.2.1", + "version": "7.0.2", "commands": [ "paket" ] }, "fake-cli": { - "version": "5.20.4-alpha.1642", + "version": "5.21.0", "commands": [ "fake" ] diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 904746c6..617cdba8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macOS-latest] - dotnet: [5.0.x] + dotnet: [6.0.x] fail-fast: false # we have timing issues on some OS, so we want them all to run runs-on: ${{ matrix.os }} timeout-minutes: 15 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e55f8046..6fe3feb5 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: os: [windows-latest] - dotnet: [5.0.x] + dotnet: [6.0.x] runs-on: ${{ matrix.os }} steps: diff --git a/.vscode/launch.json b/.vscode/launch.json index f509c316..2c2a9b4e 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,7 +8,7 @@ "name": "Launch Tool 5.0 graph resolver", "type": "coreclr", "request": "launch", - "program": "${workspaceFolder}/src/Ionide.ProjInfo.Tool/bin/Debug/net5.0/Ionide.ProjInfo.Tool.dll", + "program": "${workspaceFolder}/src/Ionide.ProjInfo.Tool/bin/Debug/net6.0/Ionide.ProjInfo.Tool.dll", "args": [ "--project", "", @@ -23,7 +23,7 @@ "name": "Launch Tool 5.0 normal resolver", "type": "coreclr", "request": "launch", - "program": "${workspaceFolder}/src/Ionide.ProjInfo.Tool/bin/Debug/net5.0/Ionide.ProjInfo.Tool.dll", + "program": "${workspaceFolder}/src/Ionide.ProjInfo.Tool/bin/Debug/net6.0/Ionide.ProjInfo.Tool.dll", "args": [ "--project", "", @@ -43,7 +43,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build", - "program": "${workspaceFolder}/test/Ionide.ProjInfo.Tests/bin/Debug/net5.0/Ionide.ProjInfo.Tests.dll", + "program": "${workspaceFolder}/test/Ionide.ProjInfo.Tests/bin/Debug/net6.0/Ionide.ProjInfo.Tests.dll", "args": [], "cwd": "${workspaceFolder}", "stopAtEntry": false, diff --git a/CHANGELOG.md b/CHANGELOG.md index 4eb49601..187d918e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.56.0] - 2022-03-19 + +### Changed + +- [Update to .NET 6](https://github.com/ionide/proj-info/pull/133) + ## [0.55.4] - 2021-11-19 ### Fixed diff --git a/global.json b/global.json index a6fb148a..807ee97e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "5.0.300", + "version": "6.0.201", "rollForward": "minor" } } \ No newline at end of file diff --git a/paket.dependencies b/paket.dependencies index 392e30e5..417defee 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -3,7 +3,7 @@ source https://api.nuget.org/v3/index.json source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json storage: none -framework: net5.0 +framework: net6.0 nuget FSharp.Core nuget FSharp.Compiler.Service ~> 41.0 @@ -33,7 +33,7 @@ github TheAngryByrd/FsLibLog src/FsLibLog/FsLibLog.fs group Build source https://api.nuget.org/v3/index.json - framework: netstandard2.0 + framework: net6.0 storage: none nuget Fake.Core.Target diff --git a/paket.lock b/paket.lock index ce89f4ad..179bfb4e 100644 --- a/paket.lock +++ b/paket.lock @@ -1,16 +1,16 @@ STORAGE: NONE -RESTRICTION: == net5.0 +RESTRICTION: == net6.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) - DotNet.ReproducibleBuilds (0.1.66) - copy_local: true - Microsoft.SourceLink.AzureRepos.Git (>= 1.0) - Microsoft.SourceLink.Bitbucket.Git (>= 1.0) - Microsoft.SourceLink.GitHub (>= 1.0) - Microsoft.SourceLink.GitLab (>= 1.0) + 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) @@ -21,11 +21,11 @@ NUGET Expecto.TestResults (8.13.2) Expecto (>= 8.13.2) FSharp.Core (>= 4.6) - FSharp.Compiler.Service (41.0.1) - FSharp.Core (6.0.1) - Microsoft.Build.Framework (>= 16.11) - Microsoft.Build.Tasks.Core (>= 16.11) - Microsoft.Build.Utilities.Core (>= 16.11) + FSharp.Compiler.Service (41.0.3) + FSharp.Core (6.0.3) + Microsoft.Build.Framework (>= 17.0) + Microsoft.Build.Tasks.Core (>= 17.0) + Microsoft.Build.Utilities.Core (>= 17.0) System.Buffers (>= 4.5.1) System.Collections.Immutable (>= 5.0) System.Diagnostics.Process (>= 4.3) @@ -39,7 +39,7 @@ NUGET System.Reflection.Metadata (>= 5.0) System.Reflection.TypeExtensions (>= 4.3) System.Runtime (>= 4.3) - System.Runtime.CompilerServices.Unsafe (>= 5.0) + System.Runtime.CompilerServices.Unsafe (>= 6.0) System.Runtime.InteropServices (>= 4.3) System.Runtime.Loader (>= 4.3) System.Security.Claims (>= 4.3) @@ -51,13 +51,13 @@ NUGET FSharp.Control.Reactive (5.0.2) FSharp.Core (>= 4.7.2) System.Reactive (>= 5.0) - FSharp.Core (6.0.1) + FSharp.Core (6.0.3) Ionide.KeepAChangelog.Tasks (0.1.2) - copy_local: true MedallionShell (1.5.1) NETStandard.Library (>= 1.6) System.Diagnostics.Process (>= 4.1) - Microsoft.Build (16.11) - copy_local: false - Microsoft.Build.Framework (>= 16.11) + Microsoft.Build (17.1) - copy_local: false + Microsoft.Build.Framework (>= 17.1) Microsoft.NET.StringTools (>= 1.0) Microsoft.Win32.Registry (>= 4.3) System.Collections.Immutable (>= 5.0) @@ -65,13 +65,14 @@ NUGET System.Reflection.Metadata (>= 1.6) System.Security.Principal.Windows (>= 4.7) System.Text.Encoding.CodePages (>= 4.0.1) - System.Text.Json (>= 4.7) - System.Threading.Tasks.Dataflow (>= 4.9) - Microsoft.Build.Framework (16.11) - copy_local: false + System.Text.Json (>= 6.0) + System.Threading.Tasks.Dataflow (>= 6.0) + Microsoft.Build.Framework (17.1) - copy_local: false + Microsoft.Win32.Registry (>= 4.3) System.Security.Permissions (>= 4.7) - Microsoft.Build.Tasks.Core (16.11) - copy_local: false - Microsoft.Build.Framework (>= 16.11) - Microsoft.Build.Utilities.Core (>= 16.11) + Microsoft.Build.Tasks.Core (17.1) - copy_local: false + Microsoft.Build.Framework (>= 17.1) + Microsoft.Build.Utilities.Core (>= 17.1) Microsoft.NET.StringTools (>= 1.0) Microsoft.Win32.Registry (>= 4.3) System.CodeDom (>= 4.4) @@ -81,10 +82,10 @@ NUGET System.Security.Cryptography.Pkcs (>= 4.7) System.Security.Cryptography.Xml (>= 4.7) System.Security.Permissions (>= 4.7) - System.Threading.Tasks.Dataflow (>= 4.9) - Microsoft.Build.Tasks.Git (1.0) - copy_local: true - Microsoft.Build.Utilities.Core (16.11) - copy_local: false - Microsoft.Build.Framework (>= 16.11) + System.Threading.Tasks.Dataflow (>= 6.0) + Microsoft.Build.Tasks.Git (1.1.1) - copy_local: true + Microsoft.Build.Utilities.Core (17.1) - copy_local: false + Microsoft.Build.Framework (>= 17.1) Microsoft.NET.StringTools (>= 1.0) Microsoft.Win32.Registry (>= 4.3) System.Collections.Immutable (>= 5.0) @@ -94,21 +95,21 @@ NUGET Microsoft.NET.StringTools (1.0) - copy_local: false System.Memory (>= 4.5.4) System.Runtime.CompilerServices.Unsafe (>= 5.0) - Microsoft.NETCore.Platforms (5.0.4) - copy_local: false + Microsoft.NETCore.Platforms (6.0.2) Microsoft.NETCore.Targets (5.0) - Microsoft.SourceLink.AzureRepos.Git (1.0) - copy_local: true - Microsoft.Build.Tasks.Git (>= 1.0) - Microsoft.SourceLink.Common (>= 1.0) - Microsoft.SourceLink.Bitbucket.Git (1.0) - copy_local: true - Microsoft.Build.Tasks.Git (>= 1.0) - Microsoft.SourceLink.Common (>= 1.0) - Microsoft.SourceLink.Common (1.0) - copy_local: true - Microsoft.SourceLink.GitHub (1.0) - copy_local: true - Microsoft.Build.Tasks.Git (>= 1.0) - Microsoft.SourceLink.Common (>= 1.0) - Microsoft.SourceLink.GitLab (1.0) - copy_local: true - Microsoft.Build.Tasks.Git (>= 1.0) - Microsoft.SourceLink.Common (>= 1.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.Win32.Primitives (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) @@ -116,8 +117,7 @@ NUGET Microsoft.Win32.Registry (5.0) - copy_local: false System.Security.AccessControl (>= 5.0) System.Security.Principal.Windows (>= 5.0) - Microsoft.Win32.SystemEvents (5.0) - copy_local: false - Microsoft.NETCore.Platforms (>= 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) @@ -165,9 +165,9 @@ NUGET runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) runtime.ubuntu.18.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - SemanticVersioning (2.0) + SemanticVersioning (2.0.2) System.Buffers (4.5.1) - System.CodeDom (5.0) - copy_local: false + System.CodeDom (6.0) - copy_local: false System.Collections (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) @@ -183,15 +183,17 @@ NUGET System.Runtime.Extensions (>= 4.3) System.Threading (>= 4.3) System.Threading.Tasks (>= 4.3) - System.Collections.Immutable (5.0) - System.Configuration.ConfigurationManager (5.0) - copy_local: false - System.Security.Cryptography.ProtectedData (>= 5.0) - System.Security.Permissions (>= 5.0) + System.Collections.Immutable (6.0) + System.Runtime.CompilerServices.Unsafe (>= 6.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 (5.0.1) + System.Diagnostics.DiagnosticSource (6.0) + System.Runtime.CompilerServices.Unsafe (>= 6.0) System.Diagnostics.Process (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.Win32.Primitives (>= 4.3) @@ -228,9 +230,9 @@ NUGET Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) - System.Drawing.Common (5.0.2) - copy_local: false - Microsoft.Win32.SystemEvents (>= 5.0) - System.Formats.Asn1 (5.0) - copy_local: false + 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) @@ -399,13 +401,14 @@ NUGET Microsoft.NETCore.Targets (>= 1.1) System.Reflection (>= 4.3) System.Runtime (>= 4.3) - System.Reflection.Metadata (5.0) + System.Reflection.Metadata (6.0.1) + System.Collections.Immutable (>= 6.0) System.Reflection.Primitives (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) System.Reflection.TypeExtensions (4.7) - System.Resources.Extensions (5.0) - copy_local: false + System.Resources.Extensions (6.0) - copy_local: false System.Resources.ResourceManager (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) @@ -415,7 +418,7 @@ NUGET System.Runtime (4.3.1) Microsoft.NETCore.Platforms (>= 1.1.1) Microsoft.NETCore.Targets (>= 1.1.3) - System.Runtime.CompilerServices.Unsafe (5.0) + System.Runtime.CompilerServices.Unsafe (6.0) System.Runtime.Extensions (4.3.1) Microsoft.NETCore.Platforms (>= 1.1.1) Microsoft.NETCore.Targets (>= 1.1.3) @@ -440,9 +443,7 @@ NUGET System.Resources.ResourceManager (>= 4.3) System.Runtime (>= 4.3) System.Runtime.Extensions (>= 4.3) - System.Security.AccessControl (5.0) - copy_local: false - Microsoft.NETCore.Platforms (>= 5.0) - System.Security.Principal.Windows (>= 5.0) + System.Security.AccessControl (6.0) - copy_local: false System.Security.Claims (4.3) System.Collections (>= 4.3) System.Globalization (>= 4.3) @@ -466,7 +467,7 @@ NUGET System.Security.Cryptography.Encoding (>= 4.3) System.Security.Cryptography.Primitives (>= 4.3) System.Text.Encoding (>= 4.3) - System.Security.Cryptography.Cng (5.0) - copy_local: false + System.Security.Cryptography.Cng (5.0) System.Formats.Asn1 (>= 5.0) System.Security.Cryptography.Csp (4.3) Microsoft.NETCore.Platforms (>= 1.1) @@ -497,9 +498,8 @@ NUGET System.Text.Encoding (>= 4.3) System.Security.Cryptography.OpenSsl (5.0) System.Formats.Asn1 (>= 5.0) - System.Security.Cryptography.Pkcs (5.0.1) - copy_local: false - System.Formats.Asn1 (>= 5.0) - System.Security.Cryptography.Cng (>= 5.0) + System.Security.Cryptography.Pkcs (6.0) - copy_local: false + System.Formats.Asn1 (>= 6.0) System.Security.Cryptography.Primitives (4.3) System.Diagnostics.Debug (>= 4.3) System.Globalization (>= 4.3) @@ -508,7 +508,7 @@ NUGET System.Runtime (>= 4.3) System.Threading (>= 4.3) System.Threading.Tasks (>= 4.3) - System.Security.Cryptography.ProtectedData (5.0) - copy_local: false + System.Security.Cryptography.ProtectedData (6.0) - copy_local: false System.Security.Cryptography.X509Certificates (4.3.2) Microsoft.NETCore.Platforms (>= 1.1) runtime.native.System (>= 4.3) @@ -535,12 +535,12 @@ NUGET System.Security.Cryptography.Primitives (>= 4.3) System.Text.Encoding (>= 4.3) System.Threading (>= 4.3) - System.Security.Cryptography.Xml (5.0) - copy_local: false - System.Security.Cryptography.Pkcs (>= 5.0) - System.Security.Permissions (>= 5.0) - System.Security.Permissions (5.0) - copy_local: false - System.Security.AccessControl (>= 5.0) - System.Windows.Extensions (>= 5.0) + 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 (4.3) System.Runtime (>= 4.3) System.Security.Principal.Windows (5.0) - copy_local: false @@ -548,14 +548,18 @@ NUGET Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) - System.Text.Encoding.CodePages (5.0) - copy_local: false - Microsoft.NETCore.Platforms (>= 5.0) + 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.Json (5.0.2) - copy_local: false + System.Text.Encodings.Web (6.0) - copy_local: false + System.Runtime.CompilerServices.Unsafe (>= 6.0) + System.Text.Json (6.0.2) - 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) @@ -563,7 +567,7 @@ NUGET Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) - System.Threading.Tasks.Dataflow (5.0) - copy_local: false + System.Threading.Tasks.Dataflow (6.0) - copy_local: false System.Threading.Tasks.Parallel (4.3) System.Collections.Concurrent (>= 4.3) System.Diagnostics.Debug (>= 4.3) @@ -578,142 +582,153 @@ NUGET System.Threading.ThreadPool (4.3) System.Runtime (>= 4.3) System.Runtime.Handles (>= 4.3) - System.Windows.Extensions (5.0) - copy_local: false - System.Drawing.Common (>= 5.0) + System.Windows.Extensions (6.0) - copy_local: false + System.Drawing.Common (>= 6.0) GITHUB remote: TheAngryByrd/FsLibLog - src/FsLibLog/FsLibLog.fs (a21347ab09d76059da324cb3e6f3e3e6a93f4ac2) + src/FsLibLog/FsLibLog.fs (a88204ea65c40557e2a6525390601da66e2eafce) GROUP Build STORAGE: NONE -RESTRICTION: == netstandard2.0 +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.20.4) - FSharp.Core (>= 4.7.2) - Octokit (>= 0.48) - Fake.Core.CommandLineParsing (5.20.4) + Fake.Api.GitHub (5.22) + FSharp.Core (>= 6.0) + Octokit (>= 0.50) + Fake.Core.CommandLineParsing (5.22) FParsec (>= 1.1.1) - FSharp.Core (>= 4.7.2) - Fake.Core.Context (5.20.4) - FSharp.Core (>= 4.7.2) - Fake.Core.Environment (5.20.4) - FSharp.Core (>= 4.7.2) - Fake.Core.FakeVar (5.20.4) - Fake.Core.Context (>= 5.20.4) - FSharp.Core (>= 4.7.2) - Fake.Core.Process (5.20.4) - Fake.Core.Environment (>= 5.20.4) - Fake.Core.FakeVar (>= 5.20.4) - Fake.Core.String (>= 5.20.4) - Fake.Core.Trace (>= 5.20.4) - Fake.IO.FileSystem (>= 5.20.4) - FSharp.Core (>= 4.7.2) - System.Collections.Immutable (>= 1.7.1) - Fake.Core.ReleaseNotes (5.20.4) - Fake.Core.SemVer (>= 5.20.4) - Fake.Core.String (>= 5.20.4) - FSharp.Core (>= 4.7.2) - Fake.Core.SemVer (5.20.4) - FSharp.Core (>= 4.7.2) - Fake.Core.String (5.20.4) - FSharp.Core (>= 4.7.2) - Fake.Core.Target (5.20.4) - Fake.Core.CommandLineParsing (>= 5.20.4) - Fake.Core.Context (>= 5.20.4) - Fake.Core.Environment (>= 5.20.4) - Fake.Core.FakeVar (>= 5.20.4) - Fake.Core.Process (>= 5.20.4) - Fake.Core.String (>= 5.20.4) - Fake.Core.Trace (>= 5.20.4) - FSharp.Control.Reactive (>= 4.4.2) - FSharp.Core (>= 4.7.2) - Fake.Core.Tasks (5.20.4) - Fake.Core.Trace (>= 5.20.4) - FSharp.Core (>= 4.7.2) - Fake.Core.Trace (5.20.4) - Fake.Core.Environment (>= 5.20.4) - Fake.Core.FakeVar (>= 5.20.4) - FSharp.Core (>= 4.7.2) - Fake.Core.UserInput (5.20.4) - FSharp.Core (>= 4.7.2) - Fake.Core.Xml (5.20.4) - Fake.Core.String (>= 5.20.4) - FSharp.Core (>= 4.7.2) - Fake.DotNet.AssemblyInfoFile (5.20.4) - Fake.Core.Environment (>= 5.20.4) - Fake.Core.String (>= 5.20.4) - Fake.Core.Trace (>= 5.20.4) - Fake.IO.FileSystem (>= 5.20.4) - FSharp.Core (>= 4.7.2) - Fake.DotNet.Cli (5.20.4) - Fake.Core.Environment (>= 5.20.4) - Fake.Core.Process (>= 5.20.4) - Fake.Core.String (>= 5.20.4) - Fake.Core.Trace (>= 5.20.4) - Fake.DotNet.MSBuild (>= 5.20.4) - Fake.DotNet.NuGet (>= 5.20.4) - Fake.IO.FileSystem (>= 5.20.4) - FSharp.Core (>= 4.7.2) + 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 (>= 12.0.3) - Fake.DotNet.MSBuild (5.20.4) + Newtonsoft.Json (>= 13.0.1) + Fake.DotNet.MSBuild (5.22) BlackFox.VsWhere (>= 1.1) - Fake.Core.Environment (>= 5.20.4) - Fake.Core.Process (>= 5.20.4) - Fake.Core.String (>= 5.20.4) - Fake.Core.Trace (>= 5.20.4) - Fake.IO.FileSystem (>= 5.20.4) - FSharp.Core (>= 4.7.2) - MSBuild.StructuredLogger (>= 2.1.176) - Fake.DotNet.NuGet (5.20.4) - Fake.Core.Environment (>= 5.20.4) - Fake.Core.Process (>= 5.20.4) - Fake.Core.SemVer (>= 5.20.4) - Fake.Core.String (>= 5.20.4) - Fake.Core.Tasks (>= 5.20.4) - Fake.Core.Trace (>= 5.20.4) - Fake.Core.Xml (>= 5.20.4) - Fake.IO.FileSystem (>= 5.20.4) - Fake.Net.Http (>= 5.20.4) - FSharp.Core (>= 4.7.2) - Newtonsoft.Json (>= 12.0.3) - NuGet.Protocol (>= 5.6) - Fake.DotNet.Paket (5.20.4) - Fake.Core.Process (>= 5.20.4) - Fake.Core.String (>= 5.20.4) - Fake.Core.Trace (>= 5.20.4) - Fake.DotNet.Cli (>= 5.20.4) - Fake.IO.FileSystem (>= 5.20.4) - FSharp.Core (>= 4.7.2) - Fake.IO.FileSystem (5.20.4) - Fake.Core.String (>= 5.20.4) - FSharp.Core (>= 4.7.2) - Fake.Net.Http (5.20.4) - Fake.Core.Trace (>= 5.20.4) - FSharp.Core (>= 4.7.2) - Fake.Tools.Git (5.20.4) - Fake.Core.Environment (>= 5.20.4) - Fake.Core.Process (>= 5.20.4) - Fake.Core.SemVer (>= 5.20.4) - Fake.Core.String (>= 5.20.4) - Fake.Core.Trace (>= 5.20.4) - Fake.IO.FileSystem (>= 5.20.4) - FSharp.Core (>= 4.7.2) + 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.1) - Microsoft.Build (16.11) - Microsoft.Build.Framework (16.11) + FSharp.Core (6.0.3) + Microsoft.Build (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.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.1) + Microsoft.Win32.Registry (>= 4.3) System.Security.Permissions (>= 4.7) - Microsoft.Build.Tasks.Core (16.11) - Microsoft.Build.Framework (>= 16.11) - Microsoft.Build.Utilities.Core (>= 16.11) + Microsoft.Build.Tasks.Core (17.1) + Microsoft.Build.Framework (>= 17.1) + Microsoft.Build.Utilities.Core (>= 17.1) Microsoft.NET.StringTools (>= 1.0) Microsoft.Win32.Registry (>= 4.3) System.CodeDom (>= 4.4) @@ -723,9 +738,9 @@ NUGET System.Security.Cryptography.Pkcs (>= 4.7) System.Security.Cryptography.Xml (>= 4.7) System.Security.Permissions (>= 4.7) - System.Threading.Tasks.Dataflow (>= 4.9) - Microsoft.Build.Utilities.Core (16.11) - Microsoft.Build.Framework (>= 16.11) + System.Threading.Tasks.Dataflow (>= 6.0) + 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) @@ -735,83 +750,68 @@ NUGET Microsoft.NET.StringTools (1.0) System.Memory (>= 4.5.4) System.Runtime.CompilerServices.Unsafe (>= 5.0) - Microsoft.NETCore.Platforms (5.0.4) - Microsoft.NETCore.Targets (5.0) Microsoft.Win32.Registry (5.0) - System.Buffers (>= 4.5.1) - System.Memory (>= 4.5.4) 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.545) + MSBuild.StructuredLogger (2.1.630) Microsoft.Build (>= 16.10) Microsoft.Build.Framework (>= 16.10) Microsoft.Build.Tasks.Core (>= 16.10) Microsoft.Build.Utilities.Core (>= 16.10) Newtonsoft.Json (13.0.1) - NuGet.Common (5.11) - NuGet.Frameworks (>= 5.11) - NuGet.Configuration (5.11) - NuGet.Common (>= 5.11) + NuGet.Common (6.1) + NuGet.Frameworks (>= 6.1) + NuGet.Configuration (6.1) + NuGet.Common (>= 6.1) System.Security.Cryptography.ProtectedData (>= 4.4) - NuGet.Frameworks (5.11) - NuGet.Packaging (5.11) - Newtonsoft.Json (>= 9.0.1) - NuGet.Configuration (>= 5.11) - NuGet.Versioning (>= 5.11) + 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 (5.11) - NuGet.Packaging (>= 5.11) - NuGet.Versioning (5.11) + NuGet.Protocol (6.1) + NuGet.Packaging (>= 6.1) + NuGet.Versioning (6.1) Octokit (0.50) - System.Buffers (4.5.1) - System.CodeDom (5.0) - System.Collections.Immutable (5.0) - System.Memory (>= 4.5.4) - System.Configuration.ConfigurationManager (5.0) - System.Security.Cryptography.ProtectedData (>= 5.0) - System.Security.Permissions (>= 5.0) - System.Formats.Asn1 (5.0) - System.Buffers (>= 4.5.1) - System.Memory (>= 4.5.4) + System.CodeDom (6.0) + 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.Buffers (>= 4.5.1) - System.Numerics.Vectors (>= 4.4) - System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - System.Numerics.Vectors (4.5) System.Reactive (5.0) - System.Runtime.InteropServices.WindowsRuntime (>= 4.3) - System.Threading.Tasks.Extensions (>= 4.5.4) - System.Reflection.Metadata (5.0) - System.Collections.Immutable (>= 5.0) - System.Resources.Extensions (5.0) - System.Memory (>= 4.5.4) - System.Runtime (4.3.1) - Microsoft.NETCore.Platforms (>= 1.1.1) - Microsoft.NETCore.Targets (>= 1.1.3) - System.Runtime.CompilerServices.Unsafe (5.0) - System.Runtime.InteropServices.WindowsRuntime (4.3) - System.Runtime (>= 4.3) - System.Security.AccessControl (5.0) - System.Security.Principal.Windows (>= 5.0) + System.Reflection.Metadata (6.0.1) + System.Collections.Immutable (>= 6.0) + System.Resources.Extensions (6.0) + System.Runtime.CompilerServices.Unsafe (6.0) + System.Security.AccessControl (6.0) System.Security.Cryptography.Cng (5.0) - System.Security.Cryptography.Pkcs (5.0.1) - System.Buffers (>= 4.5.1) System.Formats.Asn1 (>= 5.0) - System.Memory (>= 4.5.4) - System.Security.Cryptography.Cng (>= 5.0) - System.Security.Cryptography.ProtectedData (5.0) - System.Memory (>= 4.5.4) - System.Security.Cryptography.Xml (5.0) - System.Memory (>= 4.5.4) - System.Security.Cryptography.Pkcs (>= 5.0) - System.Security.Permissions (>= 5.0) - System.Security.Permissions (5.0) - System.Security.AccessControl (>= 5.0) + System.Security.Cryptography.Pkcs (6.0) + System.Formats.Asn1 (>= 6.0) + System.Security.Cryptography.ProtectedData (6.0) + System.Security.Cryptography.Xml (6.0) + System.Security.AccessControl (>= 6.0) + System.Security.Cryptography.Pkcs (>= 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 (5.0) - System.Runtime.CompilerServices.Unsafe (>= 5.0) - System.Threading.Tasks.Dataflow (5.0) - System.Threading.Tasks.Extensions (4.5.4) - System.Runtime.CompilerServices.Unsafe (>= 4.5.3) + System.Text.Encoding.CodePages (6.0) + System.Runtime.CompilerServices.Unsafe (>= 6.0) + System.Text.Encodings.Web (6.0) + System.Runtime.CompilerServices.Unsafe (>= 6.0) + System.Text.Json (6.0.2) + System.Runtime.CompilerServices.Unsafe (>= 6.0) + System.Text.Encodings.Web (>= 6.0) + System.Threading.Tasks.Dataflow (6.0) + System.Windows.Extensions (6.0) + System.Drawing.Common (>= 6.0) diff --git a/src/Ionide.ProjInfo.FCS/Ionide.ProjInfo.FCS.fsproj b/src/Ionide.ProjInfo.FCS/Ionide.ProjInfo.FCS.fsproj index fbf25add..ee95b3d5 100644 --- a/src/Ionide.ProjInfo.FCS/Ionide.ProjInfo.FCS.fsproj +++ b/src/Ionide.ProjInfo.FCS/Ionide.ProjInfo.FCS.fsproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 diff --git a/src/Ionide.ProjInfo.ProjectSystem/Ionide.ProjInfo.ProjectSystem.fsproj b/src/Ionide.ProjInfo.ProjectSystem/Ionide.ProjInfo.ProjectSystem.fsproj index c6b6f1ff..722ff7a0 100644 --- a/src/Ionide.ProjInfo.ProjectSystem/Ionide.ProjInfo.ProjectSystem.fsproj +++ b/src/Ionide.ProjInfo.ProjectSystem/Ionide.ProjInfo.ProjectSystem.fsproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 diff --git a/src/Ionide.ProjInfo.Sln/Ionide.ProjInfo.Sln.csproj b/src/Ionide.ProjInfo.Sln/Ionide.ProjInfo.Sln.csproj index 40a86893..fed9fcec 100644 --- a/src/Ionide.ProjInfo.Sln/Ionide.ProjInfo.Sln.csproj +++ b/src/Ionide.ProjInfo.Sln/Ionide.ProjInfo.Sln.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 Parse sln files FULL_SLN_PARSER;STANDALONEBUILD;$(DefineConstants) true diff --git a/src/Ionide.ProjInfo.Tool/Ionide.ProjInfo.Tool.fsproj b/src/Ionide.ProjInfo.Tool/Ionide.ProjInfo.Tool.fsproj index 5010597e..cd0c2a60 100644 --- a/src/Ionide.ProjInfo.Tool/Ionide.ProjInfo.Tool.fsproj +++ b/src/Ionide.ProjInfo.Tool/Ionide.ProjInfo.Tool.fsproj @@ -2,7 +2,7 @@ Exe - net5.0 + net6.0 true proj-info diff --git a/src/Ionide.ProjInfo/Ionide.ProjInfo.fsproj b/src/Ionide.ProjInfo/Ionide.ProjInfo.fsproj index 30fb8462..eddc22ac 100644 --- a/src/Ionide.ProjInfo/Ionide.ProjInfo.fsproj +++ b/src/Ionide.ProjInfo/Ionide.ProjInfo.fsproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 diff --git a/test/Ionide.ProjInfo.Tests/Ionide.ProjInfo.Tests.fsproj b/test/Ionide.ProjInfo.Tests/Ionide.ProjInfo.Tests.fsproj index 42e6651a..e7d36a7a 100644 --- a/test/Ionide.ProjInfo.Tests/Ionide.ProjInfo.Tests.fsproj +++ b/test/Ionide.ProjInfo.Tests/Ionide.ProjInfo.Tests.fsproj @@ -2,7 +2,7 @@ Exe - net5.0 + net6.0 false diff --git a/test/Ionide.ProjInfo.Tests/Tests.fs b/test/Ionide.ProjInfo.Tests/Tests.fs index 04e7d68b..873e8555 100644 --- a/test/Ionide.ProjInfo.Tests/Tests.fs +++ b/test/Ionide.ProjInfo.Tests/Tests.fs @@ -663,7 +663,7 @@ let testFCSmap toolsPath workspaceLoader (workspaceFactory: ToolsPath -> IWorksp let rec allP2P (po: FSharpProjectOptions) = [ for reference in po.ReferencedProjects do let opts = internalGetProjectOptions reference |> Option.get - yield reference.FileName, opts + yield reference.OutputFile, opts yield! allP2P opts ] let expectP2PKeyIsTargetPath (pos: Map) fcsPo = @@ -724,7 +724,7 @@ let testFCSmapManyProj toolsPath workspaceLoader (workspaceFactory: ToolsPath -> let rec allP2P (po: FSharpProjectOptions) = [ for reference in po.ReferencedProjects do let opts = internalGetProjectOptions reference |> Option.get - yield reference.FileName, opts + yield reference.OutputFile, opts yield! allP2P opts ] let expectP2PKeyIsTargetPath (pos: Map) fcsPo = @@ -748,9 +748,9 @@ let testFCSmapManyProj toolsPath workspaceLoader (workspaceFactory: ToolsPath -> let fcsPo = FCS.mapToFSharpProjectOptions parsed.Head parsed let hasCSharpRef = fcsPo.OtherOptions |> Seq.exists (fun opt -> opt.StartsWith "-r:" && opt.EndsWith "l1.dll") - let hasCSharpProjectRef = fcsPo.ReferencedProjects |> Seq.exists (fun ref -> ref.FileName.EndsWith "l1.dll") + let hasCSharpProjectRef = fcsPo.ReferencedProjects |> Seq.exists (fun ref -> ref.OutputFile.EndsWith "l1.dll") let hasFSharpRef = fcsPo.OtherOptions |> Seq.exists (fun opt -> opt.StartsWith "-r:" && opt.EndsWith "l2.dll") - let hasFSharpProjectRef = fcsPo.ReferencedProjects |> Seq.exists (fun ref -> ref.FileName.EndsWith "l2.dll") + let hasFSharpProjectRef = fcsPo.ReferencedProjects |> Seq.exists (fun ref -> ref.OutputFile.EndsWith "l2.dll") Expect.equal hasCSharpRef true "Should have direct dll reference to C# reference" Expect.equal hasCSharpProjectRef false "Should NOT have project reference to C# reference" Expect.equal hasFSharpRef true "Should have direct dll reference to F# reference"