From 856cd22e2689c965d00bc081573e173f60300ca2 Mon Sep 17 00:00:00 2001 From: David Hall Date: Sat, 25 May 2024 19:00:19 -0600 Subject: [PATCH] Updated NuGet packages and fixed project logic for inclusion of various NuGet packages --- Directory.Build.props | 2 +- Management/Vanara.Management.csproj | 4 ++-- PInvoke/Security/Vanara.PInvoke.Security.csproj | 2 +- Security/Vanara.Security.csproj | 4 ++-- System/Vanara.SystemServices.csproj | 9 +++++---- UnitTests/CSharpRunner/Shared.csproj | 4 ++-- UnitTests/Directory.Build.targets | 2 +- UnitTests/PInvoke/Multimedia/Multimedia.csproj | 2 +- UnitTests/PInvoke/NTDSApi/NTDSApi.csproj | 4 ++-- UnitTests/PInvoke/NdfApi/NdfApi.csproj | 2 +- UnitTests/PInvoke/Printing/Printing.csproj | 2 +- UnitTests/PInvoke/Security/Security.csproj | 2 +- UnitTests/Windows.Shell.Common/ShellItemTests.cs | 2 ++ .../Windows.Shell.Common/Windows.Shell.Common.csproj | 3 +++ Vanara.sln | 20 ++++++++++++++++++++ VirtualDisk/Vanara.VirtualDisk.csproj | 4 ++-- Windows.Extensions/Vanara.Windows.Extensions.csproj | 7 +++---- .../Vanara.Windows.Shell.Common.csproj | 12 +++++------- Windows.Shell/Vanara.Windows.Shell.csproj | 2 +- 19 files changed, 56 insertions(+), 33 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 0a1c4b85..93d1e660 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - net45;net48;net6.0;net7.0;net8.0-windows;netstandard2.0;netcoreapp3.1 + net45;net48;net5.0;net6.0;net7.0;net8.0-windows;netstandard2.0;netcoreapp3.1 Debug;Release AnyCPU;x64;x86 4.0.2 diff --git a/Management/Vanara.Management.csproj b/Management/Vanara.Management.csproj index e0651eb5..718c9790 100644 --- a/Management/Vanara.Management.csproj +++ b/Management/Vanara.Management.csproj @@ -18,8 +18,8 @@ DynamicMgmtObject, ManagementExtensions - - + + diff --git a/PInvoke/Security/Vanara.PInvoke.Security.csproj b/PInvoke/Security/Vanara.PInvoke.Security.csproj index 3f42dab6..26451a37 100644 --- a/PInvoke/Security/Vanara.PInvoke.Security.csproj +++ b/PInvoke/Security/Vanara.PInvoke.Security.csproj @@ -27,7 +27,7 @@ ACCESS_ALLOWED_ACE ACCESS_ALLOWED_CALLBACK_ACE ACCESS_ALLOWED_CALLBACK_OBJECT_AC - + \ No newline at end of file diff --git a/Security/Vanara.Security.csproj b/Security/Vanara.Security.csproj index 6aa7a603..31a8c8e4 100644 --- a/Security/Vanara.Security.csproj +++ b/Security/Vanara.Security.csproj @@ -25,8 +25,8 @@ AccountLogonRights, DesiredAccess, SystemPrivilege - - + + diff --git a/System/Vanara.SystemServices.csproj b/System/Vanara.SystemServices.csproj index 4c0ba904..f09e5b86 100644 --- a/System/Vanara.SystemServices.csproj +++ b/System/Vanara.SystemServices.csproj @@ -23,11 +23,12 @@ BatteryStatus, EdgeTraversalType, EnergySaverStatus, FirewallAction, FirewallAut + - - - - + + + + diff --git a/UnitTests/CSharpRunner/Shared.csproj b/UnitTests/CSharpRunner/Shared.csproj index 06f6f2ac..9dfc9cd2 100644 --- a/UnitTests/CSharpRunner/Shared.csproj +++ b/UnitTests/CSharpRunner/Shared.csproj @@ -8,8 +8,8 @@ --> - - + + diff --git a/UnitTests/Directory.Build.targets b/UnitTests/Directory.Build.targets index 92b4fa58..ec4edff4 100644 --- a/UnitTests/Directory.Build.targets +++ b/UnitTests/Directory.Build.targets @@ -13,7 +13,7 @@ - + diff --git a/UnitTests/PInvoke/Multimedia/Multimedia.csproj b/UnitTests/PInvoke/Multimedia/Multimedia.csproj index 7dde7150..3afcda23 100644 --- a/UnitTests/PInvoke/Multimedia/Multimedia.csproj +++ b/UnitTests/PInvoke/Multimedia/Multimedia.csproj @@ -4,7 +4,7 @@ true - + diff --git a/UnitTests/PInvoke/NTDSApi/NTDSApi.csproj b/UnitTests/PInvoke/NTDSApi/NTDSApi.csproj index 8efad490..411de6bd 100644 --- a/UnitTests/PInvoke/NTDSApi/NTDSApi.csproj +++ b/UnitTests/PInvoke/NTDSApi/NTDSApi.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/UnitTests/PInvoke/NdfApi/NdfApi.csproj b/UnitTests/PInvoke/NdfApi/NdfApi.csproj index 469ecbb0..41808876 100644 --- a/UnitTests/PInvoke/NdfApi/NdfApi.csproj +++ b/UnitTests/PInvoke/NdfApi/NdfApi.csproj @@ -7,6 +7,6 @@ - + \ No newline at end of file diff --git a/UnitTests/PInvoke/Printing/Printing.csproj b/UnitTests/PInvoke/Printing/Printing.csproj index 4bf02c2d..2afc69f8 100644 --- a/UnitTests/PInvoke/Printing/Printing.csproj +++ b/UnitTests/PInvoke/Printing/Printing.csproj @@ -3,7 +3,7 @@ UnitTest.PInvoke.Printing - + diff --git a/UnitTests/PInvoke/Security/Security.csproj b/UnitTests/PInvoke/Security/Security.csproj index 4f401a5a..1d27314d 100644 --- a/UnitTests/PInvoke/Security/Security.csproj +++ b/UnitTests/PInvoke/Security/Security.csproj @@ -6,7 +6,7 @@ - + diff --git a/UnitTests/Windows.Shell.Common/ShellItemTests.cs b/UnitTests/Windows.Shell.Common/ShellItemTests.cs index a49ca319..edc92fa3 100644 --- a/UnitTests/Windows.Shell.Common/ShellItemTests.cs +++ b/UnitTests/Windows.Shell.Common/ShellItemTests.cs @@ -273,6 +273,7 @@ public class ShellItemTests td.FileSystemPath!.WriteValues(); } + /* private static Bitmap? HToBitmap(in HBITMAP hbmp) { const System.Drawing.Imaging.PixelFormat fmt = System.Drawing.Imaging.PixelFormat.Format32bppArgb; @@ -351,4 +352,5 @@ public class ShellItemTests } } } + */ } \ No newline at end of file diff --git a/UnitTests/Windows.Shell.Common/Windows.Shell.Common.csproj b/UnitTests/Windows.Shell.Common/Windows.Shell.Common.csproj index 90b51346..c13f0bc0 100644 --- a/UnitTests/Windows.Shell.Common/Windows.Shell.Common.csproj +++ b/UnitTests/Windows.Shell.Common/Windows.Shell.Common.csproj @@ -2,6 +2,9 @@ UnitTest.Windows.Shell + + + diff --git a/Vanara.sln b/Vanara.sln index 8526ee3b..c9a91d75 100644 --- a/Vanara.sln +++ b/Vanara.sln @@ -446,6 +446,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vanara.PInvoke.WUApi", "PIn EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WUApi", "UnitTests\PInvoke\WUApi\WUApi.csproj", "{4E84A8EA-A180-4897-9542-C529A91702AC}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vanara.WindowsUpdate", "WindowsUpdate\Vanara.WindowsUpdate.csproj", "{DCD4CDCF-F963-48B6-9B8F-1F273C38952F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -3909,6 +3911,24 @@ Global {4E84A8EA-A180-4897-9542-C529A91702AC}.Release|x64.Build.0 = Release|x64 {4E84A8EA-A180-4897-9542-C529A91702AC}.Release|x86.ActiveCfg = Release|x86 {4E84A8EA-A180-4897-9542-C529A91702AC}.Release|x86.Build.0 = Release|x86 + {DCD4CDCF-F963-48B6-9B8F-1F273C38952F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DCD4CDCF-F963-48B6-9B8F-1F273C38952F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DCD4CDCF-F963-48B6-9B8F-1F273C38952F}.Debug|x64.ActiveCfg = Debug|x64 + {DCD4CDCF-F963-48B6-9B8F-1F273C38952F}.Debug|x64.Build.0 = Debug|x64 + {DCD4CDCF-F963-48B6-9B8F-1F273C38952F}.Debug|x86.ActiveCfg = Debug|x86 + {DCD4CDCF-F963-48B6-9B8F-1F273C38952F}.Debug|x86.Build.0 = Debug|x86 + {DCD4CDCF-F963-48B6-9B8F-1F273C38952F}.DebugNoTests|Any CPU.ActiveCfg = Debug|Any CPU + {DCD4CDCF-F963-48B6-9B8F-1F273C38952F}.DebugNoTests|Any CPU.Build.0 = Debug|Any CPU + {DCD4CDCF-F963-48B6-9B8F-1F273C38952F}.DebugNoTests|x64.ActiveCfg = Debug|x64 + {DCD4CDCF-F963-48B6-9B8F-1F273C38952F}.DebugNoTests|x64.Build.0 = Debug|x64 + {DCD4CDCF-F963-48B6-9B8F-1F273C38952F}.DebugNoTests|x86.ActiveCfg = Debug|x86 + {DCD4CDCF-F963-48B6-9B8F-1F273C38952F}.DebugNoTests|x86.Build.0 = Debug|x86 + {DCD4CDCF-F963-48B6-9B8F-1F273C38952F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DCD4CDCF-F963-48B6-9B8F-1F273C38952F}.Release|Any CPU.Build.0 = Release|Any CPU + {DCD4CDCF-F963-48B6-9B8F-1F273C38952F}.Release|x64.ActiveCfg = Release|x64 + {DCD4CDCF-F963-48B6-9B8F-1F273C38952F}.Release|x64.Build.0 = Release|x64 + {DCD4CDCF-F963-48B6-9B8F-1F273C38952F}.Release|x86.ActiveCfg = Release|x86 + {DCD4CDCF-F963-48B6-9B8F-1F273C38952F}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/VirtualDisk/Vanara.VirtualDisk.csproj b/VirtualDisk/Vanara.VirtualDisk.csproj index 3c4ca035..b6a18b89 100644 --- a/VirtualDisk/Vanara.VirtualDisk.csproj +++ b/VirtualDisk/Vanara.VirtualDisk.csproj @@ -21,8 +21,8 @@ CompactionMode, DeviceType, Subtype - - + + diff --git a/Windows.Extensions/Vanara.Windows.Extensions.csproj b/Windows.Extensions/Vanara.Windows.Extensions.csproj index da88b0f1..b6089832 100644 --- a/Windows.Extensions/Vanara.Windows.Extensions.csproj +++ b/Windows.Extensions/Vanara.Windows.Extensions.csproj @@ -24,9 +24,8 @@ Corners - - - - + + + \ No newline at end of file diff --git a/Windows.Shell.Common/Vanara.Windows.Shell.Common.csproj b/Windows.Shell.Common/Vanara.Windows.Shell.Common.csproj index 27654d60..c1066af2 100644 --- a/Windows.Shell.Common/Vanara.Windows.Shell.Common.csproj +++ b/Windows.Shell.Common/Vanara.Windows.Shell.Common.csproj @@ -22,14 +22,12 @@ ChangeFilters, DialogStatus, ExecutableType, FileUsageType, FolderItemFilter, Li - - - - + + + - - - + + diff --git a/Windows.Shell/Vanara.Windows.Shell.csproj b/Windows.Shell/Vanara.Windows.Shell.csproj index e310184a..b175a22e 100644 --- a/Windows.Shell/Vanara.Windows.Shell.csproj +++ b/Windows.Shell/Vanara.Windows.Shell.csproj @@ -30,7 +30,7 @@ NavigationLogDirection, SFVMUD, ShellBrowserViewMode, TaskbarItemTabThumbnailOpt - +