From 05a0540476e8e1269703bb21835b7f7cdf9a4c06 Mon Sep 17 00:00:00 2001 From: qwsdcvghyu89 <61093706+qwsdcvghyu89@users.noreply.github.com> Date: Fri, 26 Sep 2025 19:30:16 +1000 Subject: [PATCH] Update SDK version, dependencies, and version increment logic - Upgraded `.NET` SDK from 9.0.100 to 10.0.100. - Updated `NuGetToolVersion` to 7.0.0. - Adjusted version increment logic for negative delta handling. - Added new framework dependencies for improved compatibility and functionality. - Minor code adjustments and updated generated files. --- aeqw89.tools.Publish/Program.cs | 8 +++---- .../aeqw89.tools.Publish.AssemblyInfo.cs | 2 +- ...w89.tools.Publish.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 ++ .../aeqw89.tools.Publish.GlobalUsings.g.cs | 14 +++++------ .../net9.0/aeqw89.tools.Publish.assets.cache | Bin 4249 -> 4249 bytes ...w89.tools.Publish.csproj.nuget.dgspec.json | 22 ++++++++++++++++-- .../aeqw89.tools.Publish.csproj.nuget.g.props | 2 +- aeqw89.tools.Publish/obj/project.assets.json | 22 ++++++++++++++++-- aeqw89.tools.Publish/obj/project.nuget.cache | 8 +++++-- .../obj/project.packagespec.json | 2 +- .../obj/rider.project.model.nuget.info | 2 +- .../obj/rider.project.restore.info | 2 +- 13 files changed, 65 insertions(+), 23 deletions(-) diff --git a/aeqw89.tools.Publish/Program.cs b/aeqw89.tools.Publish/Program.cs index 5b98b59..6c7e040 100644 --- a/aeqw89.tools.Publish/Program.cs +++ b/aeqw89.tools.Publish/Program.cs @@ -159,10 +159,10 @@ public static class Program { ctx.Status = "Updating version"; var version = projectFile.GetVersion(); version = ChangeVersion(version, - Target == IncrementTarget.Patch ? delta : int.MinValue, - Target == IncrementTarget.Minor ? delta : int.MinValue, - Target == IncrementTarget.Major ? delta : int.MinValue, - (x, y) => int.Clamp(x + y, 0, int.MaxValue)); + Target == IncrementTarget.Patch ? delta : -1, + Target == IncrementTarget.Minor ? delta : -1, + Target == IncrementTarget.Major ? delta : -1, + (x, y) => y < 0 ? x : x + y); projectFile.SetVersion(version); } diff --git a/aeqw89.tools.Publish/obj/Debug/net9.0/aeqw89.tools.Publish.AssemblyInfo.cs b/aeqw89.tools.Publish/obj/Debug/net9.0/aeqw89.tools.Publish.AssemblyInfo.cs index 3bf6b6c..faab529 100644 --- a/aeqw89.tools.Publish/obj/Debug/net9.0/aeqw89.tools.Publish.AssemblyInfo.cs +++ b/aeqw89.tools.Publish/obj/Debug/net9.0/aeqw89.tools.Publish.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("aeqw89.tools.Publish")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+81bb2ea5c43fe48d78b65dc9e825889d8e041819")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+b61d0836ac23522cf42987fbed9474a3bda3632e")] [assembly: System.Reflection.AssemblyProductAttribute("aeqw89.tools.Publish")] [assembly: System.Reflection.AssemblyTitleAttribute("aeqw89.tools.Publish")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/aeqw89.tools.Publish/obj/Debug/net9.0/aeqw89.tools.Publish.AssemblyInfoInputs.cache b/aeqw89.tools.Publish/obj/Debug/net9.0/aeqw89.tools.Publish.AssemblyInfoInputs.cache index 777eda8..573c0aa 100644 --- a/aeqw89.tools.Publish/obj/Debug/net9.0/aeqw89.tools.Publish.AssemblyInfoInputs.cache +++ b/aeqw89.tools.Publish/obj/Debug/net9.0/aeqw89.tools.Publish.AssemblyInfoInputs.cache @@ -1 +1 @@ -53ec5207a57f615a2bd949ca74f6fa9f51b319acb2da66e55751d6a902498945 +7fc87e3000a58eaf1f393990c041ae903924d7e468beb21b7ca46d984853ce80 diff --git a/aeqw89.tools.Publish/obj/Debug/net9.0/aeqw89.tools.Publish.GeneratedMSBuildEditorConfig.editorconfig b/aeqw89.tools.Publish/obj/Debug/net9.0/aeqw89.tools.Publish.GeneratedMSBuildEditorConfig.editorconfig index 0017265..42241b7 100644 --- a/aeqw89.tools.Publish/obj/Debug/net9.0/aeqw89.tools.Publish.GeneratedMSBuildEditorConfig.editorconfig +++ b/aeqw89.tools.Publish/obj/Debug/net9.0/aeqw89.tools.Publish.GeneratedMSBuildEditorConfig.editorconfig @@ -1,5 +1,7 @@ is_global = true build_property.TargetFramework = net9.0 +build_property.TargetFrameworkIdentifier = .NETCoreApp +build_property.TargetFrameworkVersion = v9.0 build_property.TargetPlatformMinVersion = build_property.UsingMicrosoftNETSdkWeb = build_property.ProjectTypeGuids = diff --git a/aeqw89.tools.Publish/obj/Debug/net9.0/aeqw89.tools.Publish.GlobalUsings.g.cs b/aeqw89.tools.Publish/obj/Debug/net9.0/aeqw89.tools.Publish.GlobalUsings.g.cs index 8578f3d..d12bcbc 100644 --- a/aeqw89.tools.Publish/obj/Debug/net9.0/aeqw89.tools.Publish.GlobalUsings.g.cs +++ b/aeqw89.tools.Publish/obj/Debug/net9.0/aeqw89.tools.Publish.GlobalUsings.g.cs @@ -1,8 +1,8 @@ // -global using global::System; -global using global::System.Collections.Generic; -global using global::System.IO; -global using global::System.Linq; -global using global::System.Net.Http; -global using global::System.Threading; -global using global::System.Threading.Tasks; +global using System; +global using System.Collections.Generic; +global using System.IO; +global using System.Linq; +global using System.Net.Http; +global using System.Threading; +global using System.Threading.Tasks; diff --git a/aeqw89.tools.Publish/obj/Debug/net9.0/aeqw89.tools.Publish.assets.cache b/aeqw89.tools.Publish/obj/Debug/net9.0/aeqw89.tools.Publish.assets.cache index a175937963905ac7311e61e031be6134564d3e8b..15b78c7a882fc9b4f3867af5d607001892eb0b2c 100644 GIT binary patch delta 49 zcmV-10M7rJA($(UserProfile)\.nuget\packages\ C:\Users\qwsdc\.nuget\packages\ PackageReference - 6.14.0 + 7.0.0 diff --git a/aeqw89.tools.Publish/obj/project.assets.json b/aeqw89.tools.Publish/obj/project.assets.json index 6fb1e73..8e82074 100644 --- a/aeqw89.tools.Publish/obj/project.assets.json +++ b/aeqw89.tools.Publish/obj/project.assets.json @@ -317,7 +317,7 @@ "auditLevel": "low", "auditMode": "direct" }, - "SdkAnalysisLevel": "9.0.100" + "SdkAnalysisLevel": "10.0.100" }, "frameworks": { "net9.0": { @@ -347,12 +347,30 @@ ], "assetTargetFallback": true, "warn": true, + "downloadDependencies": [ + { + "name": "Microsoft.AspNetCore.App.Ref", + "version": "[9.0.9, 9.0.9]" + }, + { + "name": "Microsoft.NETCore.App.Host.win-x64", + "version": "[9.0.9, 9.0.9]" + }, + { + "name": "Microsoft.NETCore.App.Ref", + "version": "[9.0.9, 9.0.9]" + }, + { + "name": "Microsoft.WindowsDesktop.App.Ref", + "version": "[9.0.9, 9.0.9]" + } + ], "frameworkReferences": { "Microsoft.NETCore.App": { "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.101/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\10.0.100-rc.1.25451.107/PortableRuntimeIdentifierGraph.json" } } } diff --git a/aeqw89.tools.Publish/obj/project.nuget.cache b/aeqw89.tools.Publish/obj/project.nuget.cache index abc4ae9..bea5f9f 100644 --- a/aeqw89.tools.Publish/obj/project.nuget.cache +++ b/aeqw89.tools.Publish/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "PlMFcEG0EnM=", + "dgSpecHash": "lSSpLey1hfc=", "success": true, "projectFilePath": "C:\\Users\\qwsdc\\source\\repos\\aeqw89.tools.Publish\\aeqw89.tools.Publish\\aeqw89.tools.Publish.csproj", "expectedPackageFiles": [ @@ -9,7 +9,11 @@ "C:\\Users\\qwsdc\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\8.0.2\\microsoft.extensions.dependencyinjection.abstractions.8.0.2.nupkg.sha512", "C:\\Users\\qwsdc\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\8.0.3\\microsoft.extensions.logging.abstractions.8.0.3.nupkg.sha512", "C:\\Users\\qwsdc\\.nuget\\packages\\spectre.console\\0.51.2-preview.0.1\\spectre.console.0.51.2-preview.0.1.nupkg.sha512", - "C:\\Users\\qwsdc\\.nuget\\packages\\ssh.net\\2025.0.0\\ssh.net.2025.0.0.nupkg.sha512" + "C:\\Users\\qwsdc\\.nuget\\packages\\ssh.net\\2025.0.0\\ssh.net.2025.0.0.nupkg.sha512", + "C:\\Users\\qwsdc\\.nuget\\packages\\microsoft.netcore.app.ref\\9.0.9\\microsoft.netcore.app.ref.9.0.9.nupkg.sha512", + "C:\\Users\\qwsdc\\.nuget\\packages\\microsoft.windowsdesktop.app.ref\\9.0.9\\microsoft.windowsdesktop.app.ref.9.0.9.nupkg.sha512", + "C:\\Users\\qwsdc\\.nuget\\packages\\microsoft.aspnetcore.app.ref\\9.0.9\\microsoft.aspnetcore.app.ref.9.0.9.nupkg.sha512", + "C:\\Users\\qwsdc\\.nuget\\packages\\microsoft.netcore.app.host.win-x64\\9.0.9\\microsoft.netcore.app.host.win-x64.9.0.9.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/aeqw89.tools.Publish/obj/project.packagespec.json b/aeqw89.tools.Publish/obj/project.packagespec.json index 090afc5..1d64a55 100644 --- a/aeqw89.tools.Publish/obj/project.packagespec.json +++ b/aeqw89.tools.Publish/obj/project.packagespec.json @@ -1 +1 @@ -"restore":{"projectUniqueName":"C:\\Users\\qwsdc\\source\\repos\\aeqw89.tools.Publish\\aeqw89.tools.Publish\\aeqw89.tools.Publish.csproj","projectName":"aeqw89.tools.Publish","projectPath":"C:\\Users\\qwsdc\\source\\repos\\aeqw89.tools.Publish\\aeqw89.tools.Publish\\aeqw89.tools.Publish.csproj","outputPath":"C:\\Users\\qwsdc\\source\\repos\\aeqw89.tools.Publish\\aeqw89.tools.Publish\\obj\\","projectStyle":"PackageReference","originalTargetFrameworks":["net9.0"],"sources":{"C:\\Users\\qwsdc\\packages":{},"https://api.nuget.org/v3/index.json":{},"https://nuget.pkg.github.com/qwsdcvghyu89/index.json":{}},"frameworks":{"net9.0":{"targetAlias":"net9.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.100"}"frameworks":{"net9.0":{"targetAlias":"net9.0","dependencies":{"SSH.NET":{"target":"Package","version":"[2025.0.0, )"},"Spectre.Console":{"target":"Package","version":"[0.51.2-preview.0.1, )"},"aeqw89.xml.ProjectFile":{"target":"Package","version":"[1.0.3, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\9.0.101/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file +"restore":{"projectUniqueName":"C:\\Users\\qwsdc\\source\\repos\\aeqw89.tools.Publish\\aeqw89.tools.Publish\\aeqw89.tools.Publish.csproj","projectName":"aeqw89.tools.Publish","projectPath":"C:\\Users\\qwsdc\\source\\repos\\aeqw89.tools.Publish\\aeqw89.tools.Publish\\aeqw89.tools.Publish.csproj","outputPath":"C:\\Users\\qwsdc\\source\\repos\\aeqw89.tools.Publish\\aeqw89.tools.Publish\\obj\\","projectStyle":"PackageReference","originalTargetFrameworks":["net9.0"],"sources":{"C:\\Users\\qwsdc\\packages":{},"https://api.nuget.org/v3/index.json":{},"https://nuget.pkg.github.com/qwsdcvghyu89/index.json":{}},"frameworks":{"net9.0":{"targetAlias":"net9.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"10.0.100"}"frameworks":{"net9.0":{"targetAlias":"net9.0","dependencies":{"SSH.NET":{"target":"Package","version":"[2025.0.0, )"},"Spectre.Console":{"target":"Package","version":"[0.51.2-preview.0.1, )"},"aeqw89.xml.ProjectFile":{"target":"Package","version":"[1.0.3, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"downloadDependencies":[{"name":"Microsoft.AspNetCore.App.Ref","version":"[9.0.9, 9.0.9]"},{"name":"Microsoft.NETCore.App.Host.win-x64","version":"[9.0.9, 9.0.9]"},{"name":"Microsoft.NETCore.App.Ref","version":"[9.0.9, 9.0.9]"},{"name":"Microsoft.WindowsDesktop.App.Ref","version":"[9.0.9, 9.0.9]"}],"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\10.0.100-rc.1.25451.107/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/aeqw89.tools.Publish/obj/rider.project.model.nuget.info b/aeqw89.tools.Publish/obj/rider.project.model.nuget.info index 27cf721..98d5745 100644 --- a/aeqw89.tools.Publish/obj/rider.project.model.nuget.info +++ b/aeqw89.tools.Publish/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17584372950452857 \ No newline at end of file +17584393464480743 \ No newline at end of file diff --git a/aeqw89.tools.Publish/obj/rider.project.restore.info b/aeqw89.tools.Publish/obj/rider.project.restore.info index b0fbaa8..bc4876c 100644 --- a/aeqw89.tools.Publish/obj/rider.project.restore.info +++ b/aeqw89.tools.Publish/obj/rider.project.restore.info @@ -1 +1 @@ -17584377737753019 \ No newline at end of file +17588788734490530 \ No newline at end of file