Skip to content

Commit 822a25b

Browse files
authored
Fix CA2000 Warning: Properly Dispose of RegistryKey in Example Code. (#44089)
1 parent 9c423c0 commit 822a25b

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

docs/framework/migration-guide/snippets/csharp/versions-installed.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ private static void Get45PlusFromRegistry()
9898
//<snippet2>
9999
const string subkey = @"SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\";
100100

101-
using (var ndpKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32).OpenSubKey(subkey))
101+
using (var baseKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32))
102+
using (var ndpKey = baseKey.OpenSubKey(subkey))
102103
{
103104
if (ndpKey != null && ndpKey.GetValue("Release") != null)
104105
{

docs/framework/migration-guide/snippets/visual-basic/versions-installed.vb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ Module Program
7272
Private Sub Get45PlusFromRegistry()
7373
Const subkey As String = "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\"
7474

75-
Using ndpKey As RegistryKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32).OpenSubKey(subkey)
75+
Using baseKey As RegistryKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32),
76+
ndpKey As RegistryKey = baseKey.OpenSubKey(subkey)
7677
If ndpKey IsNot Nothing AndAlso ndpKey.GetValue("Release") IsNot Nothing Then
7778
Console.WriteLine($".NET Framework Version: {CheckFor45PlusVersion(ndpKey.GetValue("Release"))}")
7879
Else

0 commit comments

Comments
 (0)