From de7ef8a9fe66d2b538b835264dd3b330718199fe Mon Sep 17 00:00:00 2001 From: Zoltan Tanczos Date: Wed, 29 May 2024 17:12:50 +0200 Subject: [PATCH 1/2] Upgrade dotnet-please to .NET 8 - Upgrade TargetFramework to net8.0, and also upgrade nuget dependencies to latest - Refactor code to address breaking changes in MediatR and FluentAssertions --- DotNetPlease.Tests/DotNetPlease.Tests.csproj | 14 +- .../TestUtils/PathEquivalencyStep.cs | 16 +- DotNetPlease/App.cs | 2 +- DotNetPlease/Commands/AddToPath.cs | 2 +- DotNetPlease/Commands/ChangeNamespace.cs | 2 +- DotNetPlease/Commands/CleanupProjectFiles.cs | 2 +- DotNetPlease/Commands/ConsolidatePackages.cs | 2 +- .../Commands/EvaluateProjectProperties.cs | 2 +- DotNetPlease/Commands/ExpandReferences.cs | 2 +- DotNetPlease/Commands/FindStrayProjects.cs | 2 +- DotNetPlease/Commands/FixProjectReferences.cs | 2 +- .../Commands/Internal/MoveProjects.cs | 2 +- DotNetPlease/Commands/MoveProject.cs | 2 +- DotNetPlease/Commands/PullPackageVersions.cs | 2 +- DotNetPlease/Commands/RemoveFromPath.cs | 2 +- DotNetPlease/Commands/RemoveJunk.cs | 2 +- .../Commands/RestorePackageVersions.cs | 2 +- DotNetPlease/DotNetPlease.csproj | 23 +- DotNetPlease/Internal/CommandHandlerBase.cs | 6 +- DotNetPlease/packages.lock.json | 339 ++++-------------- 20 files changed, 124 insertions(+), 304 deletions(-) diff --git a/DotNetPlease.Tests/DotNetPlease.Tests.csproj b/DotNetPlease.Tests/DotNetPlease.Tests.csproj index ddadb20..2c0bbf5 100644 --- a/DotNetPlease.Tests/DotNetPlease.Tests.csproj +++ b/DotNetPlease.Tests/DotNetPlease.Tests.csproj @@ -1,19 +1,19 @@ - net6.0 + net8.0 DotNetPlease false enable - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/DotNetPlease.Tests/TestUtils/PathEquivalencyStep.cs b/DotNetPlease.Tests/TestUtils/PathEquivalencyStep.cs index 7437ea0..ea66d9f 100644 --- a/DotNetPlease.Tests/TestUtils/PathEquivalencyStep.cs +++ b/DotNetPlease.Tests/TestUtils/PathEquivalencyStep.cs @@ -17,15 +17,15 @@ namespace DotNetPlease.TestUtils { public class PathEquivalencyStep : IEquivalencyStep { - public bool CanHandle(IEquivalencyValidationContext context, IEquivalencyAssertionOptions config) + public EquivalencyResult Handle(Comparands comparands, IEquivalencyValidationContext context, IEquivalencyValidator nestedValidator) { - return (context.Subject is null || context.Subject is string) - && (context.Expectation is null || context.Expectation is string); - } - - public bool Handle(IEquivalencyValidationContext context, IEquivalencyValidator parent, IEquivalencyAssertionOptions config) - { - return FileSystemHelper.PathComparer.Equals((string)context.Subject, (string)context.Expectation); + if ((comparands.Subject is null || comparands.Subject is not string) + || (comparands.Expectation is null || comparands.Expectation is not string)) + { + return EquivalencyResult.ContinueWithNext; + } + + return FileSystemHelper.PathComparer.Equals((string)comparands.Subject, (string)comparands.Expectation) ? EquivalencyResult.AssertionCompleted : EquivalencyResult.ContinueWithNext; } } diff --git a/DotNetPlease/App.cs b/DotNetPlease/App.cs index 22510ff..b2f17a4 100644 --- a/DotNetPlease/App.cs +++ b/DotNetPlease/App.cs @@ -41,7 +41,7 @@ internal App(Func? overrideServices) private void ConfigureServices(IServiceCollection services) { services - .AddMediatR(typeof(Program).Assembly) + .AddMediatR(cfg => cfg.RegisterServicesFromAssembly(typeof(Program).Assembly)) .AddTransient() .AddSingleton(); services.TryAddSingleton(); diff --git a/DotNetPlease/Commands/AddToPath.cs b/DotNetPlease/Commands/AddToPath.cs index d7b03d5..0ee6aa6 100644 --- a/DotNetPlease/Commands/AddToPath.cs +++ b/DotNetPlease/Commands/AddToPath.cs @@ -44,7 +44,7 @@ public CommandHandler(CommandHandlerDependencies dependencies) : base(dependenci { } - protected override Task Handle(Command command, CancellationToken cancellationToken) + public override Task Handle(Command command, CancellationToken cancellationToken) { var path = Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.User) ?? ""; var paths = path.Split(Path.PathSeparator).Select(p => p.Trim()).ToHashSet(FileSystemHelper.PathComparer); diff --git a/DotNetPlease/Commands/ChangeNamespace.cs b/DotNetPlease/Commands/ChangeNamespace.cs index 36de71a..51fc66c 100644 --- a/DotNetPlease/Commands/ChangeNamespace.cs +++ b/DotNetPlease/Commands/ChangeNamespace.cs @@ -44,7 +44,7 @@ public class Command : IRequest [UsedImplicitly] public class CommandHandler : CommandHandlerBase { - protected override Task Handle(Command command, CancellationToken cancellationToken) + public override Task Handle(Command command, CancellationToken cancellationToken) { Reporter.Info($"Changing namespace \"{command.OldNamespace}\" to \"{command.NewNamespace}\""); diff --git a/DotNetPlease/Commands/CleanupProjectFiles.cs b/DotNetPlease/Commands/CleanupProjectFiles.cs index 01c62cb..427d8ae 100644 --- a/DotNetPlease/Commands/CleanupProjectFiles.cs +++ b/DotNetPlease/Commands/CleanupProjectFiles.cs @@ -40,7 +40,7 @@ public class Command : IRequest [UsedImplicitly] public class CommandHandler : CommandHandlerBase { - protected override Task Handle(Command command, CancellationToken cancellationToken) + public override Task Handle(Command command, CancellationToken cancellationToken) { Reporter.Info($"Cleaning up project files"); diff --git a/DotNetPlease/Commands/ConsolidatePackages.cs b/DotNetPlease/Commands/ConsolidatePackages.cs index cbe335a..e952aac 100644 --- a/DotNetPlease/Commands/ConsolidatePackages.cs +++ b/DotNetPlease/Commands/ConsolidatePackages.cs @@ -67,7 +67,7 @@ public class Command : IRequest [UsedImplicitly] public class CommandHandler : CommandHandlerBase { - protected override Task Handle(Command command, CancellationToken cancellationToken) + public override Task Handle(Command command, CancellationToken cancellationToken) { if (!string.IsNullOrWhiteSpace(command.Version) && string.IsNullOrWhiteSpace(command.PackageName)) { diff --git a/DotNetPlease/Commands/EvaluateProjectProperties.cs b/DotNetPlease/Commands/EvaluateProjectProperties.cs index 42f54d0..80adaf7 100644 --- a/DotNetPlease/Commands/EvaluateProjectProperties.cs +++ b/DotNetPlease/Commands/EvaluateProjectProperties.cs @@ -33,7 +33,7 @@ public class Command : IRequest [UsedImplicitly] public class CommandHandler : CommandHandlerBase { - protected override Task Handle(Command command, CancellationToken cancellationToken) + public override Task Handle(Command command, CancellationToken cancellationToken) { Reporter.Info("Evaluating project properties"); diff --git a/DotNetPlease/Commands/ExpandReferences.cs b/DotNetPlease/Commands/ExpandReferences.cs index 26daaa1..179d6fc 100644 --- a/DotNetPlease/Commands/ExpandReferences.cs +++ b/DotNetPlease/Commands/ExpandReferences.cs @@ -44,7 +44,7 @@ public class Command : IRequest [UsedImplicitly] public class CommandHandler : CommandHandlerBase { - protected override Task Handle(Command command, CancellationToken cancellationToken) + public override Task Handle(Command command, CancellationToken cancellationToken) { var context = CreateContext(command); diff --git a/DotNetPlease/Commands/FindStrayProjects.cs b/DotNetPlease/Commands/FindStrayProjects.cs index 0f370f0..2d5fb1d 100644 --- a/DotNetPlease/Commands/FindStrayProjects.cs +++ b/DotNetPlease/Commands/FindStrayProjects.cs @@ -34,7 +34,7 @@ public class Command : IRequest [UsedImplicitly] public class CommandHandler : CommandHandlerBase { - protected override Task Handle(Command command, CancellationToken cancellationToken) + public override Task Handle(Command command, CancellationToken cancellationToken) { Reporter.Info($"Searching for stray projects"); diff --git a/DotNetPlease/Commands/FixProjectReferences.cs b/DotNetPlease/Commands/FixProjectReferences.cs index 706b854..2685f11 100644 --- a/DotNetPlease/Commands/FixProjectReferences.cs +++ b/DotNetPlease/Commands/FixProjectReferences.cs @@ -36,7 +36,7 @@ public class Command : IRequest [UsedImplicitly] public class CommandHandler : CommandHandlerBase { - protected override Task Handle(Command command, CancellationToken cancellationToken) + public override Task Handle(Command command, CancellationToken cancellationToken) { Reporter.Info($"Fixing project references"); diff --git a/DotNetPlease/Commands/Internal/MoveProjects.cs b/DotNetPlease/Commands/Internal/MoveProjects.cs index e2856d2..07e3193 100644 --- a/DotNetPlease/Commands/Internal/MoveProjects.cs +++ b/DotNetPlease/Commands/Internal/MoveProjects.cs @@ -57,7 +57,7 @@ public ProjectMoveItem(string oldProjectFileName, string newProjectFileName) [UsedImplicitly] public class CommandHandler : CommandHandlerBase { - protected override Task Handle(Command command, CancellationToken cancellationToken) + public override Task Handle(Command command, CancellationToken cancellationToken) { var projects = Workspace.LoadProjects(); var context = new Context(command, projects); diff --git a/DotNetPlease/Commands/MoveProject.cs b/DotNetPlease/Commands/MoveProject.cs index c6855f7..8ee3b7f 100644 --- a/DotNetPlease/Commands/MoveProject.cs +++ b/DotNetPlease/Commands/MoveProject.cs @@ -43,7 +43,7 @@ public class Command : IRequest [UsedImplicitly] public class CommandHandler : CommandHandlerBase { - protected override Task Handle(Command command, CancellationToken cancellationToken) + public override Task Handle(Command command, CancellationToken cancellationToken) { Reporter.Info($"Moving/renaming project \"{command.ProjectName}\" to \"{command.NewProjectName}\""); diff --git a/DotNetPlease/Commands/PullPackageVersions.cs b/DotNetPlease/Commands/PullPackageVersions.cs index 507b5db..4426137 100644 --- a/DotNetPlease/Commands/PullPackageVersions.cs +++ b/DotNetPlease/Commands/PullPackageVersions.cs @@ -47,7 +47,7 @@ public class Command : IRequest [UsedImplicitly] public class CommandHandler : CommandHandlerBase { - protected override Task Handle(Command command, CancellationToken cancellationToken) + public override Task Handle(Command command, CancellationToken cancellationToken) { Reporter.Info($"Pulling package versions from project files"); diff --git a/DotNetPlease/Commands/RemoveFromPath.cs b/DotNetPlease/Commands/RemoveFromPath.cs index 2129668..be5706f 100644 --- a/DotNetPlease/Commands/RemoveFromPath.cs +++ b/DotNetPlease/Commands/RemoveFromPath.cs @@ -44,7 +44,7 @@ public CommandHandler(CommandHandlerDependencies dependencies) : base(dependenci { } - protected override Task Handle(Command command, CancellationToken cancellationToken) + public override Task Handle(Command command, CancellationToken cancellationToken) { var path = Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.User) ?? ""; var paths = path.Split(Path.PathSeparator).Select(p => p.Trim()).ToHashSet(PathComparer); diff --git a/DotNetPlease/Commands/RemoveJunk.cs b/DotNetPlease/Commands/RemoveJunk.cs index bb28d13..819d0b9 100644 --- a/DotNetPlease/Commands/RemoveJunk.cs +++ b/DotNetPlease/Commands/RemoveJunk.cs @@ -41,7 +41,7 @@ public class Command : IRequest [UsedImplicitly] public class CommandHandler : CommandHandlerBase { - protected override Task Handle(Command command, CancellationToken cancellationToken) + public override Task Handle(Command command, CancellationToken cancellationToken) { var context = new Context(command, Workspace.SolutionFileName); diff --git a/DotNetPlease/Commands/RestorePackageVersions.cs b/DotNetPlease/Commands/RestorePackageVersions.cs index e902e1c..436101b 100644 --- a/DotNetPlease/Commands/RestorePackageVersions.cs +++ b/DotNetPlease/Commands/RestorePackageVersions.cs @@ -41,7 +41,7 @@ public class Command : IRequest public class CommandHandler : CommandHandlerBase { - protected override Task Handle(Command command, CancellationToken cancellationToken) + public override Task Handle(Command command, CancellationToken cancellationToken) { Reporter.Info($"Restoring package versions"); diff --git a/DotNetPlease/DotNetPlease.csproj b/DotNetPlease/DotNetPlease.csproj index 5b96475..85e1caf 100644 --- a/DotNetPlease/DotNetPlease.csproj +++ b/DotNetPlease/DotNetPlease.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable Debug;Release MorganStanley.DotNetPlease @@ -24,21 +24,20 @@ - - - - - - + + + + + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/DotNetPlease/Internal/CommandHandlerBase.cs b/DotNetPlease/Internal/CommandHandlerBase.cs index 239db8f..8048f74 100644 --- a/DotNetPlease/Internal/CommandHandlerBase.cs +++ b/DotNetPlease/Internal/CommandHandlerBase.cs @@ -12,10 +12,12 @@ using DotNetPlease.Services.Reporting.Abstractions; using MediatR; +using System.Threading; +using System.Threading.Tasks; namespace DotNetPlease.Internal { - public abstract class CommandHandlerBase : AsyncRequestHandler where TCommand : IRequest + public abstract class CommandHandlerBase : IRequestHandler where TCommand : IRequest { protected IReporter Reporter { get; } protected IMediator Mediator { get; } @@ -27,5 +29,7 @@ protected CommandHandlerBase(CommandHandlerDependencies dependencies) Mediator = dependencies.Mediator; Workspace = dependencies.Workspace; } + + public abstract Task Handle(TCommand request, CancellationToken cancellationToken); } } \ No newline at end of file diff --git a/DotNetPlease/packages.lock.json b/DotNetPlease/packages.lock.json index 7b2a73b..3c0a702 100644 --- a/DotNetPlease/packages.lock.json +++ b/DotNetPlease/packages.lock.json @@ -1,69 +1,55 @@ { "version": 1, "dependencies": { - "net6.0": { + "net8.0": { "JetBrains.Annotations": { "type": "Direct", - "requested": "[2019.1.3, )", - "resolved": "2019.1.3", - "contentHash": "E0x48BwZJKoNMNCekWGKsV4saQS89lf58ydT2szseV44CMYIbaHXjc7+305WLw6up3ibZN9yH6QdGSZo5tQhLg==" + "requested": "[2023.3.0, )", + "resolved": "2023.3.0", + "contentHash": "PHfnvdBUdGaTVG9bR/GEfxgTwWM0Z97Y6X3710wiljELBISipSfF5okn/vz+C2gfO+ihoEyVPjaJwn8ZalVukA==" }, "MediatR": { "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "cYSDJ2b/dIiwTLW/ZW/SQcXq9I3WF6KR4D0KN4hxWR08tZqcvcVS1bQXZbsANdQdTQfxx+ZFp5WkHLMyeoR5Zw==" - }, - "MediatR.Extensions.Microsoft.DependencyInjection": { - "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "qGa+dbfrpk6y01swgc0uM+jG5tkb5xVeY1P4iByd3NQCDO7nmrMBnBRoMGhKlSigQ6iWXDiwOpzC01W4xrJxLg==", + "requested": "[12.2.0, )", + "resolved": "12.2.0", + "contentHash": "8TUFrHapKi6D74PhnSNEguRsH91HNGyP3R4ZQdgDorJgl9Wac5Prh0vA33QfrniAaS6L2xNNhc6vxzg+5AIbwA==", "dependencies": { - "MediatR": "8.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.0.0" + "MediatR.Contracts": "[2.0.1, 3.0.0)", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" } }, "Microsoft.Build": { "type": "Direct", - "requested": "[16.11.0, )", - "resolved": "16.11.0", - "contentHash": "azKjcFDIGgyVWRtSSYr/Zb42xV1F0iyQyjOzdpg34UEz7HFvGJl7av7HZrNSaQ2hCqqdgfU+e9gTzguJywBofA==", + "requested": "[17.10.4, )", + "resolved": "17.10.4", + "contentHash": "ZmGA8vhVXFzC4oo48ybQKlEybVKd0Ntfdr+Enqrn5ES1R6e/krIK9hLk0W33xuT0/G6QYd3YdhJZh+Xle717Ag==", "dependencies": { - "Microsoft.Build.Framework": "16.11.0", - "Microsoft.NET.StringTools": "1.0.0", - "Microsoft.Win32.Registry": "4.3.0", - "System.Collections.Immutable": "5.0.0", - "System.Configuration.ConfigurationManager": "4.7.0", - "System.Reflection.Metadata": "1.6.0", - "System.Security.Principal.Windows": "4.7.0", - "System.Text.Encoding.CodePages": "4.0.1", - "System.Text.Json": "4.7.0", - "System.Threading.Tasks.Dataflow": "4.9.0" + "Microsoft.Build.Framework": "17.10.4", + "Microsoft.NET.StringTools": "17.10.4", + "System.Collections.Immutable": "8.0.0", + "System.Configuration.ConfigurationManager": "8.0.0", + "System.Reflection.Metadata": "8.0.0", + "System.Reflection.MetadataLoadContext": "8.0.0", + "System.Security.Principal.Windows": "5.0.0", + "System.Threading.Tasks.Dataflow": "8.0.0" } }, "Microsoft.Build.Framework": { "type": "Direct", - "requested": "[16.11.0, )", - "resolved": "16.11.0", - "contentHash": "ZBKk+0W/fstpsYg7j1nNvqUQ4vjl4xetKwRf7/CCp956lckEOKuCpNO9yj0yO/UlmUaNGU+8csF+oYWIdOZGPw==", - "dependencies": { - "System.Security.Permissions": "4.7.0" - } + "requested": "[17.10.4, )", + "resolved": "17.10.4", + "contentHash": "4qXCwNOXBR1dyCzuks9SwTwFJQO/xmf2wcMislotDWJu7MN/r3xDNoU8Ae5QmKIHPaLG1xmfDkYS7qBVzxmeKw==" }, "Microsoft.Build.Utilities.Core": { "type": "Direct", - "requested": "[16.11.0, )", - "resolved": "16.11.0", - "contentHash": "qJ02OPuYuCkcJRm3AeUV3GT6vQ1yGg4ChKi6wc+X7bSJqu6yuTxwVn7kSPx/4uD/kPyhJkzOPRi1ez5SLdXFeQ==", + "requested": "[17.10.4, )", + "resolved": "17.10.4", + "contentHash": "eEB/tcXkSV+nQgvoa/l53UPtn+KVtKZ8zBceDZsXVTrfE4fA+4+/olrx9W8n2tq4XiESsL9UuGJgCKzqBwQCoQ==", "dependencies": { - "Microsoft.Build.Framework": "16.11.0", - "Microsoft.NET.StringTools": "1.0.0", - "Microsoft.Win32.Registry": "4.3.0", - "System.Collections.Immutable": "5.0.0", - "System.Configuration.ConfigurationManager": "4.7.0", - "System.Security.Permissions": "4.7.0", - "System.Text.Encoding.CodePages": "4.0.1" + "Microsoft.Build.Framework": "17.10.4", + "Microsoft.NET.StringTools": "17.10.4", + "System.Collections.Immutable": "8.0.0", + "System.Configuration.ConfigurationManager": "8.0.0" } }, "Microsoft.CSharp": { @@ -74,40 +60,36 @@ }, "Microsoft.Extensions.DependencyInjection": { "type": "Direct", - "requested": "[6.0.1, )", - "resolved": "6.0.1", - "contentHash": "vWXPg3HJQIpZkENn1KWq8SfbqVujVD7S7vIAyFXXqK5xkf1Vho+vG0bLBCHxU36lD1cLLtmGpfYf0B3MYFi9tQ==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "V8S3bsm50ig6JSyrbcJJ8bW2b9QLGouz+G1miK3UTaOWmMtFwNNNzUf4AleyDWUmTrWMLNnFSLEQtxmxgNQnNQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" } }, "Microsoft.Extensions.FileSystemGlobbing": { "type": "Direct", - "requested": "[6.0.0, )", - "resolved": "6.0.0", - "contentHash": "ip8jnL1aPiaPeKINCqaTEbvBFDmVx9dXQEBZ2HOBRXPD1eabGNqP/bKlsIcp7U2lGxiXd5xIhoFcmY8nM4Hdiw==" + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "OK+670i7esqlQrPjdIKRbsyMCe9g5kSLpRRQGSr4Q58AOYEe/hCnfLZprh7viNisSUUQZmMrbbuDaIrP+V1ebQ==" }, "MinVer": { "type": "Direct", - "requested": "[4.3.0, )", - "resolved": "4.3.0", - "contentHash": "YNVAW3loCFW4kTwensApaZUl+7xREK75QQNOFSbsbXx2sCSm9/IHBjUHsJGn3u0UA5r/sAqrdYBNUlOFfLhUrA==" + "requested": "[5.0.0, )", + "resolved": "5.0.0", + "contentHash": "ybkgpQMtt0Fo91l5rYtE3TZtD+Nmy5Ko091xvfXXOosQdMi30XO2EZ2+ShZt89gdu7RMmJqZaJ+e1q6d+6+KNw==" }, "NuGet.Versioning": { "type": "Direct", - "requested": "[6.5.0, )", - "resolved": "6.5.0", - "contentHash": "a2j4bDoSBVagDZ+Q61kAmxs/kY8q16cgNDdZuo867j5ip2F4yInjy1v8Ec9LslbP7QBtMzGDWw7rfBlFt6qofg==" + "requested": "[6.10.0, )", + "resolved": "6.10.0", + "contentHash": "ytTA08tgZWo/Pbk333hnzQfiMyyynkkwMt4GyC5T0bzExYYSRNrkwv4jT8jmWr5LUOYsumEZvXdoven2SA7YZw==" }, "System.Collections.Immutable": { "type": "Direct", - "requested": "[6.0.0, )", - "resolved": "6.0.0", - "contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==" }, "System.CommandLine": { "type": "Direct", @@ -132,90 +114,44 @@ "System.Text.Encoding": "4.3.0" } }, + "MediatR.Contracts": { + "type": "Transitive", + "resolved": "2.0.1", + "contentHash": "FYv95bNT4UwcNA+G/J1oX5OpRiSUxteXaUt2BJbRSdRNiIUNbggJF69wy6mnk2wYToaanpdXZdCwVylt96MpwQ==" + }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" + "resolved": "8.0.0", + "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==" }, "Microsoft.NET.StringTools": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "ZYVcoDM0LnSyT5nWoRGfShYdOecCw2sOXWwP6j1Z0u48Xq3+BVvZ+EiPCX9/8Gz439giW+O1H1kWF9Eb/w6rVg==", - "dependencies": { - "System.Memory": "4.5.4", - "System.Runtime.CompilerServices.Unsafe": "5.0.0" - } + "resolved": "17.10.4", + "contentHash": "wyABaqY+IHCMMSTQmcc3Ca6vbmg5BaEPgicnEgpll+4xyWZWlkQqUwafweUd9VAhBb4jqplMl6voUHQ6yfdUcg==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "3.1.0", - "contentHash": "z7aeg8oHln2CuNulfhiLYxCVMPEwBl3rzicjvIX+4sUuCwvXw5oXQEtbiU2c0z4qYL5L3Kmx0mMA/+t/SbY67w==" + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", "resolved": "1.1.2", "contentHash": "wETQM2IJ1uP//roY/Yz7f7NnJPzX8xgxux9+hVvkXtD1Yr6VsXefS9KZIO3He18LD7h7ACgirp5rNlEeNI0ynA==" }, - "Microsoft.Win32.Registry": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "Lw1/VwLH1yxz6SfFEjVRCN0pnflLEsWgnV4qsdJ512/HhTwnKXUG+zDQ4yTO3K/EJQemGoNaBHX5InISNKTzUQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0" - } - }, - "Microsoft.Win32.SystemEvents": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "mtVirZr++rq+XCDITMUdnETD59XoeMxSpLRIII7JRI6Yj0LEDiO1pPn0ktlnIj12Ix8bfvQqQDMMIF9wC98oCA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "3.1.0" - } - }, - "System.Collections": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, "System.Configuration.ConfigurationManager": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "/anOTeSZCNNI2zDilogWrZ8pNqCmYbzGNexUnNhjW8k0sHqEZ2nHJBp147jBV3hGYswu5lINpNg1vxR7bnqvVA==", - "dependencies": { - "System.Security.Cryptography.ProtectedData": "4.7.0", - "System.Security.Permissions": "4.7.0" - } - }, - "System.Drawing.Common": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "v+XbyYHaZjDfn0ENmJEV1VYLgGgCTx1gnfOBcppowbpOAriglYgGCvFCPr2EEZyBvXlpxbEsTwkOlInl107ahA==", + "resolved": "8.0.0", + "contentHash": "JlYi9XVvIREURRUlGMr1F6vOFLk7YSY4p1vHo4kX3tQ0AGrjqlRWHDi66ImHhy6qwXBG3BJ6Y1QlYQ+Qz6Xgww==", "dependencies": { - "Microsoft.NETCore.Platforms": "3.1.0", - "Microsoft.Win32.SystemEvents": "4.7.0" + "System.Diagnostics.EventLog": "8.0.0", + "System.Security.Cryptography.ProtectedData": "8.0.0" } }, - "System.Globalization": { + "System.Diagnostics.EventLog": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } + "resolved": "8.0.0", + "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A==" }, "System.IO": { "type": "Transitive", @@ -234,43 +170,21 @@ "resolved": "4.5.4", "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==" }, - "System.Reflection": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, "System.Reflection.Metadata": { "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" - }, - "System.Reflection.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", + "resolved": "8.0.0", + "contentHash": "ptvgrFh7PvWI8bcVqG5rsA/weWM09EnthFHR5SCnS6IN+P4mj6rE1lBDC4U8HL9/57htKAqy4KQ3bBj84cfYyQ==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" + "System.Collections.Immutable": "8.0.0" } }, - "System.Resources.ResourceManager": { + "System.Reflection.MetadataLoadContext": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==", + "resolved": "8.0.0", + "contentHash": "SZxrQ4sQYnIcdwiO3G/lHZopbPYQ2lW0ioT4JezgccWUrKaKbHLJbAGZaDfkYjWcta1pWssAo3MOXLsR0ie4tQ==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Globalization": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" + "System.Collections.Immutable": "8.0.0", + "System.Reflection.Metadata": "8.0.0" } }, "System.Runtime": { @@ -282,71 +196,15 @@ "Microsoft.NETCore.Targets": "1.1.0" } }, - "System.Runtime.CompilerServices.Unsafe": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" - }, - "System.Runtime.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.Handles": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.InteropServices": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" - } - }, - "System.Security.AccessControl": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "JECvTt5aFF3WT3gHpfofL2MNNP6v84sxtXxpqhLBCcDRzqsPBmHhQ6shv4DwwN2tRlzsUxtb3G9M3763rbXKDg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "3.1.0", - "System.Security.Principal.Windows": "4.7.0" - } - }, "System.Security.Cryptography.ProtectedData": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ehYW0m9ptxpGWvE4zgqongBVWpSDU/JCFD4K7krxkQwSz/sFQjEXCUqpvencjy6DYDbn7Ig09R8GFffu8TtneQ==" - }, - "System.Security.Permissions": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "dkOV6YYVBnYRa15/yv004eCGRBVADXw8qRbbNiCn/XpdJSUXkkUeIvdvFHkvnko4CdKMqG8yRHC4ox83LSlMsQ==", - "dependencies": { - "System.Security.AccessControl": "4.7.0", - "System.Windows.Extensions": "4.7.0" - } + "resolved": "8.0.0", + "contentHash": "+TUFINV2q2ifyXauQXRwy4CiBhqvDEDZeVJU7qfxya4aRYOKzVBpN+4acx25VcPB9ywUN6C0n8drWl110PhZEg==" }, "System.Security.Principal.Windows": { "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==" + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, "System.Text.Encoding": { "type": "Transitive", @@ -358,39 +216,6 @@ "System.Runtime": "4.3.0" } }, - "System.Text.Encoding.CodePages": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "h4z6rrA/hxWf4655D18IIZ0eaLRa3tQC/j+e26W+VinIHY0l07iEXaAvO0YSYq3MvCjMYy8Zs5AdC1sxNQOB7Q==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "System.Collections": "4.0.11", - "System.Globalization": "4.0.11", - "System.IO": "4.1.0", - "System.Reflection": "4.1.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.Handles": "4.0.1", - "System.Runtime.InteropServices": "4.1.0", - "System.Text.Encoding": "4.0.11", - "System.Threading": "4.0.11" - } - }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "IPq/x/d5nAcnD3vIyM3AbPOaTgcqrh0AqPSx7U53UFu3M6k1TH1u/eXc9/h4jm/3mpP1WRUpevlPY4PACd7AWw==" - }, - "System.Threading": { - "type": "Transitive", - "resolved": "4.0.11", - "contentHash": "N+3xqIcg3VDKyjwwCGaZ9HawG9aC6cSDI+s7ROma310GQo8vilFZa86hqKppwTHleR/G0sfOzhvgnUxWCR/DrQ==", - "dependencies": { - "System.Runtime": "4.1.0", - "System.Threading.Tasks": "4.0.11" - } - }, "System.Threading.Tasks": { "type": "Transitive", "resolved": "4.3.0", @@ -403,16 +228,8 @@ }, "System.Threading.Tasks.Dataflow": { "type": "Transitive", - "resolved": "4.9.0", - "contentHash": "dTS+3D/GtG2/Pvc3E5YzVvAa7aQJgLDlZDIzukMOJjYudVOQOUXEU68y6Zi3Nn/jqIeB5kOCwrGbQFAKHVzXEQ==" - }, - "System.Windows.Extensions": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "CeWTdRNfRaSh0pm2gDTJFwVaXfTq6Xwv/sA887iwPTneW7oMtMlpvDIO+U60+3GWTB7Aom6oQwv5VZVUhQRdPQ==", - "dependencies": { - "System.Drawing.Common": "4.7.0" - } + "resolved": "8.0.0", + "contentHash": "7V0I8tPa9V7UxMx/+7DIwkhls5ouaEMQx6l/GwGm1Y8kJQ61On9B/PxCXFLbgu5/C47g0BP2CUYs+nMv1+Oaqw==" } } } From 37be7cb6aab5fdd7df54b1755567a2fddf5e1198 Mon Sep 17 00:00:00 2001 From: Zoltan Tanczos Date: Thu, 30 May 2024 11:12:34 +0200 Subject: [PATCH 2/2] - Upgrade dotnet-version to 8.0.x in build.yml workflow file --- .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 c71207f..30fdc0a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@4d6c8fcf3c8f7a60068d26b594648e99df24cee3 # v4.0.0 with: - dotnet-version: '6.0.x' + dotnet-version: '8.0.x' - name: Restore dependencies run: dotnet restore --locked-mode