sean-m
/
Vanara
mirror of https://github.com/dahall/Vanara.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Updated NuGet packages and fixed project logic for inclusion of various NuGet packages

master
David Hall 2024-05-25 19:00:19 -06:00
parent 8568b342aa
commit 856cd22e26
19 changed files with 56 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Directory.Build.props
View File

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFrameworks>net45;net48;net6.0;net7.0;net8.0-windows;netstandard2.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net45;net48;net5.0;net6.0;net7.0;net8.0-windows;netstandard2.0;netcoreapp3.1</TargetFrameworks>
<Configurations>Debug;Release</Configurations>
<Platforms>AnyCPU;x64;x86</Platforms>
<Version>4.0.2</Version>

4
Management/Vanara.Management.csproj
View File

@ -18,8 +18,8 @@ DynamicMgmtObject, ManagementExtensions
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' != 'net45' ">
<PackageReference Include="System.Management" Version="6.0.2" Condition=" '$(TargetFramework)' == 'netcoreapp3.1' " />
<PackageReference Include="System.Management" Version="7.0.2" Condition=" '$(TargetFramework)' != 'netcoreapp3.1' " />
<PackageReference Include="System.Management" Version="6.0.2" Condition=" '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net5.0' " />
<PackageReference Include="System.Management" Version="8.0.0" Condition=" '$(TargetFramework)' != 'netcoreapp3.1' And '$(TargetFramework)' != 'net5.0' " />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System.Management" />

2
PInvoke/Security/Vanara.PInvoke.Security.csproj
View File

@ -27,7 +27,7 @@ ACCESS_ALLOWED_ACE ACCESS_ALLOWED_CALLBACK_ACE ACCESS_ALLOWED_CALLBACK_OBJECT_AC
<ProjectReference Include="..\Shared\Vanara.PInvoke.Shared.csproj" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="System.Security.AccessControl" Version="6.0.0" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.1" />
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
</ItemGroup>
</Project>

4
Security/Vanara.Security.csproj
View File

@ -25,8 +25,8 @@ AccountLogonRights, DesiredAccess, SystemPrivilege
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="System.DirectoryServices" Version="6.0.0" Condition=" '$(TargetFramework)' == 'netcoreapp3.1' " />
<PackageReference Include="System.DirectoryServices" Version="7.0.0" Condition=" '$(TargetFramework)' != 'netcoreapp3.1' " />
<PackageReference Include="System.DirectoryServices" Version="6.0.1" Condition=" '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net5.0' " />
<PackageReference Include="System.DirectoryServices" Version="8.0.0" Condition=" '$(TargetFramework)' != 'netcoreapp3.1' And '$(TargetFramework)' != 'net5.0' " />
</ItemGroup>
</Otherwise>
</Choose>

9
System/Vanara.SystemServices.csproj
View File

@ -23,11 +23,12 @@ BatteryStatus, EdgeTraversalType, EnergySaverStatus, FirewallAction, FirewallAut
<Reference Include="System.ServiceProcess" Condition=" $(TargetFramework.StartsWith('net4')) " />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' != 'net45' ">
<PackageReference Include="System.Drawing.Common" Version="8.0.5" Condition=" $(TargetFramework.StartsWith('net8')) " />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" Condition=" $(TargetFramework.StartsWith('netstandard')) Or $(TargetFramework.StartsWith('netcore')) Or $(TargetFramework.StartsWith('net5')) " />
<PackageReference Include="System.Management" Version="6.0.2" Condition=" '$(TargetFramework)' == 'netcoreapp3.1' " />
<PackageReference Include="System.Management" Version="7.0.2" Condition=" '$(TargetFramework)' != 'netcoreapp3.1' " />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.1" Condition=" '$(TargetFramework)' == 'netcoreapp3.1' " />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.1" Condition=" '$(TargetFramework)' != 'netcoreapp3.1' " />
<PackageReference Include="System.Management" Version="6.0.2" Condition=" '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net5.0' " />
<PackageReference Include="System.Management" Version="8.0.0" Condition=" '$(TargetFramework)' != 'netcoreapp3.1' And '$(TargetFramework)' != 'net5.0' " />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.1" Condition=" '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net5.0' " />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.0" Condition=" '$(TargetFramework)' != 'netcoreapp3.1' And '$(TargetFramework)' != 'net5.0' " />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\PInvoke\AMSI\Vanara.PInvoke.AMSI.csproj" />

4
UnitTests/CSharpRunner/Shared.csproj
View File

@ -8,8 +8,8 @@
<Reference Include="System.Net.Http" />-->
</ItemGroup>
<ItemGroup>
<PackageReference Include="ICSharpCode.Decompiler" Version="8.1.0.7455" />
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.6.0" />
<PackageReference Include="ICSharpCode.Decompiler" Version="8.2.0.7535" />
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.9.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
<ItemGroup>

2
UnitTests/Directory.Build.targets
View File

@ -13,7 +13,7 @@
<SupportedPlatform Include="windows" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
</ItemGroup>

2
UnitTests/PInvoke/Multimedia/Multimedia.csproj
View File

@ -4,7 +4,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.5" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\PInvoke\Multimedia\Vanara.PInvoke.Multimedia.csproj" />

4
UnitTests/PInvoke/NTDSApi/NTDSApi.csproj
View File

@ -10,8 +10,8 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="System.DirectoryServices" Version="6.0.0" Condition=" '$(TargetFramework)' == 'netcoreapp3.1' " />
<PackageReference Include="System.DirectoryServices" Version="7.0.0" Condition=" '$(TargetFramework)' != 'netcoreapp3.1' " />
<PackageReference Include="System.DirectoryServices" Version="6.0.1" Condition=" '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net5.0' " />
<PackageReference Include="System.DirectoryServices" Version="8.0.0" Condition=" '$(TargetFramework)' != 'netcoreapp3.1' And '$(TargetFramework)' != 'net5.0' " />
</ItemGroup>
</Otherwise>
</Choose>

2
UnitTests/PInvoke/NdfApi/NdfApi.csproj
View File

@ -7,6 +7,6 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\PInvoke\NdfApi\Vanara.PInvoke.NdfApi.csproj" />
<PackageReference Include="dSPACE.Runtime.InteropServices" Version="1.1.3" />
<PackageReference Include="dSPACE.Runtime.InteropServices" Version="1.10.0" />
</ItemGroup>
</Project>

2
UnitTests/PInvoke/Printing/Printing.csproj
View File

@ -3,7 +3,7 @@
<AssemblyName>UnitTest.PInvoke.Printing</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.5" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\PInvoke\Kernel32\Vanara.PInvoke.Kernel32.csproj" />

2
UnitTests/PInvoke/Security/Security.csproj
View File

@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="7.0.0" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
<!--<Reference Include="System.ServiceProcess" />-->

2
UnitTests/Windows.Shell.Common/ShellItemTests.cs
View File

@ -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
}
}
}
*/
}

3
UnitTests/Windows.Shell.Common/Windows.Shell.Common.csproj
View File

@ -2,6 +2,9 @@
<PropertyGroup>
<AssemblyName>UnitTest.Windows.Shell</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Drawing.Common" Version="8.0.5" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\PInvoke\ComCtl32\Vanara.PInvoke.ComCtl32.csproj" />
<ProjectReference Include="..\..\PInvoke\Kernel32\Vanara.PInvoke.Kernel32.csproj" />

20
Vanara.sln
View File

@ -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

4
VirtualDisk/Vanara.VirtualDisk.csproj
View File

@ -21,8 +21,8 @@ CompactionMode, DeviceType, Subtype
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" Condition=" $(TargetFramework.StartsWith('netstandard')) Or $(TargetFramework.StartsWith('netcore')) Or $(TargetFramework.StartsWith('net5')) " />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' != 'net45' ">
<PackageReference Include="System.Management" Version="6.0.2" Condition=" '$(TargetFramework)' == 'netcoreapp3.1' " />
<PackageReference Include="System.Management" Version="7.0.2" Condition=" '$(TargetFramework)' != 'netcoreapp3.1' " />
<PackageReference Include="System.Management" Version="6.0.2" Condition=" '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net5.0' " />
<PackageReference Include="System.Management" Version="8.0.0" Condition=" '$(TargetFramework)' != 'netcoreapp3.1' And '$(TargetFramework)' != 'net5.0' " />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System.Management" />

7
Windows.Extensions/Vanara.Windows.Extensions.csproj
View File

@ -24,9 +24,8 @@ Corners
<ProjectReference Include="..\PInvoke\Gdi32\Vanara.PInvoke.Gdi32.csproj" />
<ProjectReference Include="..\PInvoke\User32\Vanara.PInvoke.User32.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Drawing.Common" Version="6.0.0" Condition=" $(TargetFramework.StartsWith('netcore')) " />
<PackageReference Include="System.Drawing.Common" Version="7.0.0" Condition=" $(TargetFramework.StartsWith('netstandard')) " />
<PackageReference Include="System.Drawing.Common" Version="8.0.0" Condition=" $(TargetFramework.StartsWith('net8')) " />
<ItemGroup Condition=" !$(TargetFramework.StartsWith('net4')) ">
<PackageReference Include="System.Drawing.Common" Version="6.0.0" Condition=" $(TargetFramework.StartsWith('netcore')) Or $(TargetFramework.StartsWith('net5')) " />
<PackageReference Include="System.Drawing.Common" Version="8.0.5" Condition=" !$(TargetFramework.StartsWith('netcore')) And !$(TargetFramework.StartsWith('net5')) " />
</ItemGroup>
</Project>

12
Windows.Shell.Common/Vanara.Windows.Shell.Common.csproj
View File

@ -22,14 +22,12 @@ ChangeFilters, DialogStatus, ExecutableType, FileUsageType, FolderItemFilter, Li
<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
<Reference Include="System.Configuration" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" Condition=" $(TargetFramework.StartsWith('netcore')) " />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" Condition=" $(TargetFramework.StartsWith('netstandard')) " />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" Condition=" $(TargetFramework.StartsWith('net8')) " />
<ItemGroup Condition=" !$(TargetFramework.StartsWith('net4')) ">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" Condition=" '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net5.0' " />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" Condition=" '$(TargetFramework)' != 'netcoreapp3.1' And '$(TargetFramework)' != 'net5.0' " />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" Condition=" $(TargetFramework.StartsWith('netcore')) Or $(TargetFramework.StartsWith('netstandard')) Or $(TargetFramework.StartsWith('net5')) Or $(TargetFramework.StartsWith('net6')) Or $(TargetFramework.StartsWith('net7')) " />
<PackageReference Include="System.Security.Permissions" Version="6.0.0" Condition=" $(TargetFramework.StartsWith('netcore')) " />
<PackageReference Include="System.Security.Permissions" Version="7.0.0" Condition=" $(TargetFramework.StartsWith('net5')) Or $(TargetFramework.StartsWith('net6')) Or $(TargetFramework.StartsWith('net7')) " />
<PackageReference Include="System.Security.Permissions" Version="8.0.0" Condition=" $(TargetFramework.StartsWith('net8')) " />
<PackageReference Include="System.Security.Permissions" Version="6.0.0" Condition=" '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net5.0' " />
<PackageReference Include="System.Security.Permissions" Version="8.0.0" Condition=" '$(TargetFramework)' != 'netcoreapp3.1' And '$(TargetFramework)' != 'net5.0' " />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Core\Vanara.Core.csproj" />

2
Windows.Shell/Vanara.Windows.Shell.csproj
View File

@ -30,7 +30,7 @@ NavigationLogDirection, SFVMUD, ShellBrowserViewMode, TaskbarItemTabThumbnailOpt
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Drawing.Common" Version="6.0.0" Condition=" $(TargetFramework.StartsWith('netcore')) " />
<PackageReference Include="System.Drawing.Common" Version="7.0.0" Condition=" $(TargetFramework.StartsWith('netstandard')) " />
<PackageReference Include="System.Drawing.Common" Version="8.0.5" Condition=" $(TargetFramework.StartsWith('netstandard')) " />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Core\Vanara.Core.csproj" />