Skip to content

Commit 9ebe5af

Browse files
author
dahall
committed
Updated version to 4.1.1 and fixed bug with creating a SafeHANDLE derivative (#519)
1 parent 808b869 commit 9ebe5af

9 files changed

+147
-144
lines changed

Diff for: CodeGen/SafeHandleTemplate.cs

+3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ public partial class ClassName : BaseClassName
1010
/// <param name="ownsHandle"><see langword="true"/> to reliably release the handle during the finalization phase; otherwise, <see langword="false"/> (not recommended).</param>
1111
public ClassName(IntPtr preexistingHandle = default, bool ownsHandle = true) : base(preexistingHandle, ownsHandle) { }
1212

13+
/// <summary>Initializes a new instance of the <see cref="ClassName"/> class.</summary>
14+
private ClassName() : this(default, true) { }
15+
1316
/// <summary>Gets a <see cref="ClassName"/> object that represents a null handle.</summary>
1417
#pragma warning disable CS0109 // Member does not hide an inherited member
1518
public static new ClassName Null => new(IntPtr.Zero, false);

Diff for: CodeGen/Vanara.CodeGen.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
1313
<IsRoslynComponent>true</IsRoslynComponent>
1414
<IncludeBuildOutput>false</IncludeBuildOutput>
15-
<NoPackageAnalysis>true</NoPackageAnalysis>
15+
<NoPackageAnalysis>true</NoPackageAnalysis>
16+
<PackFolder>analyzers\cs</PackFolder>
1617
</PropertyGroup>
1718

1819
<ItemGroup>
@@ -30,6 +31,7 @@
3031
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" PrivateAssets="all" />
3132
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
3233
<PackageReference Include="LumenWorksCsvReader" Version="4.0.0" PrivateAssets="all" GeneratePathProperty="true" />
34+
<None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
3335
<None Include="$(PkgLumenWorksCsvReader)\lib\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
3436
</ItemGroup>
3537

Diff for: Directory.Build.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<TargetFrameworksNotStd>net48;net6.0;net7.0;net8.0-windows;net9.0-windows;netcoreapp3.1</TargetFrameworksNotStd>
66
<Configurations>Debug;Release</Configurations>
77
<Platforms>AnyCPU;x64;x86</Platforms>
8-
<Version>4.1.0</Version>
9-
<PackageVersion>4.1.0</PackageVersion>
8+
<Version>4.1.1</Version>
9+
<PackageVersion>4.1.1</PackageVersion>
1010
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1111
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
1212
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
@@ -25,7 +25,7 @@
2525
</PropertyGroup>
2626

2727
<!-- Custom generator -->
28-
<PropertyGroup Condition="'$(MSBuildProjectExtension)'=='.csproj'" >
28+
<PropertyGroup Condition="'$(MSBuildProjectExtension)'=='.csproj'">
2929
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
3030
</PropertyGroup>
3131
<ItemGroup Condition="'$(MSBuildProjectName)'!='Vanara.Core' And '$(MSBuildProjectName)'!='Vanara.CodeGen'">

Diff for: PInvoke/VssApi/AssemblyInfo.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ using namespace System::Security::Permissions;
1111
[assembly:AssemblyProductAttribute(L"Vanara")];
1212
[assembly:AssemblyCopyrightAttribute(L"Copyright © 2017-2025")];
1313
[assembly:AssemblyKeyFileAttribute(L"..\\..\\Vanara.snk")]
14-
[assembly:AssemblyVersionAttribute("4.1.0.0")];
15-
[assembly:AssemblyInformationalVersionAttribute("4.1.0")];
14+
[assembly:AssemblyVersionAttribute("4.1.1.0")];
15+
[assembly:AssemblyInformationalVersionAttribute("4.1.1")];
1616

1717
[assembly:ComVisible(false)];

Diff for: PInvoke/VssApi/Vanara.PInvoke.VssApi.nuspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
33
<metadata>
44
<id>Vanara.PInvoke.VssApi</id>
5-
<version>4.1.0</version>
5+
<version>4.1.1</version>
66
<description>PInvoke API (methods, structures and constants) imported from Windows Volume Shadow Copy Service (VssApi.dll).</description>
77
<copyright>Copyright © 2017-2025</copyright>
88
<authors>David Hall</authors>
@@ -16,7 +16,7 @@
1616
<language>en-US</language>
1717
<dependencies>
1818
<group targetFramework="net8.0-windows7.0">
19-
<dependency id="Vanara.PInvoke.Shared" version="4.1.0" exclude="Build,Analyzers" />
19+
<dependency id="Vanara.PInvoke.Shared" version="4.1.1" exclude="Build,Analyzers" />
2020
</group>
2121
</dependencies>
2222
<releaseNotes></releaseNotes>

Diff for: PInvoke/VssApi/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Vanara.Core" version="4.1.0" targetFramework="native" developmentDependency="true" />
4-
<package id="Vanara.PInvoke.Shared" version="4.1.0" targetFramework="native" developmentDependency="true" />
3+
<package id="Vanara.Core" version="4.1.1" targetFramework="native" developmentDependency="true" />
4+
<package id="Vanara.PInvoke.Shared" version="4.1.1" targetFramework="native" developmentDependency="true" />
55
</packages>

Diff for: UnitTests/ExplorerBrowser/ExplorerBrowserTestForm.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ private void knownFolderNavigate_Click(object? sender, EventArgs e)
169169
try
170170
{
171171
// Navigate to a known folder
172-
explorerBrowser.Navigate(ShellItem.Open(((KFItem)knownFolderCombo.SelectedItem).ShellItem));
172+
explorerBrowser.Navigate(ShellItem.Open(((KFItem)knownFolderCombo.SelectedItem!).ShellItem));
173173
}
174174
catch (COMException)
175175
{
@@ -217,7 +217,7 @@ private void NavigationLog_NavigationLogChanged(object? sender, Vanara.Windows.F
217217
navigationHistoryCombo.Items.Clear();
218218
foreach (var shobj in explorerBrowser.History.Locations)
219219
{
220-
navigationHistoryCombo.Items.Add(shobj.Name);
220+
navigationHistoryCombo.Items.Add(shobj.Name!);
221221
}
222222
}
223223
if (explorerBrowser.History.CurrentLocationIndex == -1)

Diff for: UnitTests/PInvoke/Kernel32/LibLoaderApiTests.cs

+2-4
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,14 @@ public void EnumResourceNamesTest()
5656
public void FindResourceTest()
5757
{
5858
using SafeHINSTANCE hLib = LoadLibraryEx(@"comctl32.dll", IntPtr.Zero, LoadLibraryExFlags.LOAD_LIBRARY_AS_IMAGE_RESOURCE);
59-
IntPtr ptr = (IntPtr)FindResource(hLib, 65, ResourceType.RT_STRING);
60-
Assert.That(ptr, Is.Not.EqualTo(IntPtr.Zero));
59+
Assert.That(FindResource(hLib, 65, ResourceType.RT_STRING), ResultIs.ValidHandle);
6160
}
6261

6362
[Test]
6463
public void FindResourceExTest()
6564
{
6665
using SafeHINSTANCE hLib = LoadLibraryEx(@"comctl32.dll", IntPtr.Zero, LoadLibraryExFlags.LOAD_LIBRARY_AS_IMAGE_RESOURCE);
67-
IntPtr ptr = (IntPtr)FindResourceEx(hLib, 65, ResourceType.RT_STRING, 1033);
68-
Assert.That(ptr, Is.Not.EqualTo(IntPtr.Zero));
66+
Assert.That(FindResourceEx(hLib, 65, ResourceType.RT_STRING, default), ResultIs.Not.ValidHandle);
6967
}
7068

7169
[Test]

0 commit comments

Comments
 (0)