Update project to target .NET 10.0 and adjust related configurations

This commit is contained in:
2025-11-15 13:57:26 -07:00
parent e11f80dc1c
commit 1010bcb772
7 changed files with 17 additions and 25 deletions

2
.vscode/launch.json vendored
View File

@ -9,7 +9,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "Build",
"program": "${workspaceFolder}/bin/Debug/net8.0/win-x64/File-Folder-Helper.dll",
"program": "${workspaceFolder}/bin/Debug/net10.0/win-x64/File-Folder-Helper.dll",
"args": [
"s",
"X",

8
.vscode/tasks.json vendored
View File

@ -57,11 +57,11 @@
"type": "pickString"
},
{
"default": "net8.0",
"default": "net10.0",
"description": "Which Core Version?",
"id": "CoreVersion",
"options": [
"net8.0"
"net10.0"
],
"type": "pickString"
},
@ -344,7 +344,7 @@
"false",
"4"
],
"command": "L:/DevOps/Mesa_FI/File-Folder-Helper/bin/Release/net8.0/win-x64/publish/File-Folder-Helper.exe",
"command": "L:/DevOps/Mesa_FI/File-Folder-Helper/bin/Release/net10.0/win-x64/publish/File-Folder-Helper.exe",
"label": "File-Folder-Helper AOT s X Day-Helper-2025-03-20",
"problemMatcher": [],
"type": "shell"
@ -358,7 +358,7 @@
"*.json",
"D:/ProgramData/EC_Characterization_Si/Dummy/DEP08CEPIEPSILON/WorkWeek"
],
"command": "L:/DevOps/Mesa_FI/File-Folder-Helper/bin/Release/net8.0/win-x64/publish/File-Folder-Helper.exe",
"command": "L:/DevOps/Mesa_FI/File-Folder-Helper/bin/Release/net10.0/win-x64/publish/File-Folder-Helper.exe",
"label": "File-Folder-Helper AOT s X Day-Helper-2025-10-22",
"problemMatcher": [],
"type": "shell"

View File

@ -932,13 +932,6 @@ public partial class KeePassFileRootDeletedObject
internal static partial class Helper20240105
{
// Folders with these names will be put in the root instead.
private static readonly string[] _BlacklistedFolders =
[
"KeePassHttp Passwords",
"KeePassXC-Browser Passwords"
];
private static readonly string[] _BlacklistedFields = [
"KeePassXC-Browser Settings",
"KeePassHttp Settings"

View File

@ -125,7 +125,7 @@ internal static partial class Helper20241217 {
string path = Path.Combine(directory, "verify.json");
ReadOnlyCollection<File> files = GetFiles(directory, searchPattern, ignoreFileNames);
ReadOnlyCollection<File> collection = GetFilteredFiles(searchPattern, ignoreFileNames, files);
double filesTotalLength = collection.Select(l => l.Length).Sum();
double filesTotalLength = collection.Sum(l => l.Length);
Job job = new(AlternatePath: "C:/Users/phares",
Directory: directory,
Extension: ".iso",
@ -235,7 +235,7 @@ internal static partial class Helper20241217 {
private static Job GetJob(string searchPattern, string[] ignoreFileNames, Record record, ReadOnlyCollection<File> files) {
Job result;
ReadOnlyCollection<File> collection = GetFilteredFiles(searchPattern, ignoreFileNames, files);
double filesTotalLengthNew = collection.Select(l => l.Length).Sum();
double filesTotalLengthNew = collection.Sum(l => l.Length);
result = new(AlternatePath: record.Job.AlternatePath,
Directory: record.SourceDirectory,
Extension: record.Job.Extension,
@ -256,8 +256,8 @@ internal static partial class Helper20241217 {
result = false;
logger.LogWarning("<{directory}> file count has changed {filesCountNew} != {filesCountOld}", record.SourceDirectory, filesCountNew, filesCountOld);
} else {
double filesTotalLengthOld = collection.Select(l => l.Length).Sum();
double filesTotalLengthNew = jobNew.Files.Select(l => l.Length).Sum();
double filesTotalLengthOld = collection.Sum(l => l.Length);
double filesTotalLengthNew = jobNew.Files.Sum(l => l.Length);
if (filesTotalLengthNew != filesTotalLengthOld) {
result = false;
logger.LogWarning("<{directory}> file length has changed {filesTotalLengthNew} != {filesTotalLengthOld}", record.SourceDirectory, filesTotalLengthNew, filesTotalLengthOld);

View File

@ -3,7 +3,7 @@
<Nullable>enable</Nullable>
<OutputType>Exe</OutputType>
<ImplicitUsings>enable</ImplicitUsings>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<UserSecretsId>8da397d4-13ec-4576-9722-3c79cad25563</UserSecretsId>
@ -14,12 +14,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="DiscUtils.Iso9660" Version="0.16.13" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
<PackageReference Include="Phares.Metadata" Version="8.0.118.14905" />
<PackageReference Include="Phares.Shared" Version="8.0.118.14905" />
<PackageReference Include="runtime.win-x64.Microsoft.DotNet.ILCompiler" Version="8.0.21" />
<PackageReference Include="System.Text.Json" Version="9.0.7" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
<PackageReference Include="Phares.Metadata" Version="10.0.100.116" />
<PackageReference Include="Phares.Shared" Version="10.0.100.116" />
<PackageReference Include="runtime.win-x64.Microsoft.DotNet.ILCompiler" Version="10.0.0" />
<PackageReference Include="TextCopy" Version="6.2.1" />
<PackageReference Include="WindowsShortcutFactory" Version="1.2.0" />
<PackageReference Include="YamlDotNet" Version="16.3.0" />

View File

@ -84,7 +84,7 @@ public static class RijndaelEncryption
/// </summary>
/// <param name="salt">The password salt</param>
/// <returns></returns>
#pragma warning disable SYSLIB0022, SYSLIB0041, CA5379
#pragma warning disable SYSLIB0022, SYSLIB0041, CA5379, SYSLIB0060
private static RijndaelManaged NewRijndaelManaged(string salt)
{
ArgumentNullException.ThrowIfNull(salt);

View File

@ -1,6 +1,6 @@
{
"sdk": {
"rollForward": "latestMinor",
"version": "8.0.113"
"version": "10.0.100"
}
}