Minor update

ViveportSoftware · Aug 28, 2021 · 761ce14 · 761ce14
1 parent c886de7
commit 761ce14
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 12 deletions.
diff --git a/source/Htc.Vita.Core/Auth/OAuth2.AuthorizationCodeFlow.cs b/source/Htc.Vita.Core/Auth/OAuth2.AuthorizationCodeFlow.cs
@@ -378,7 +378,9 @@ public abstract partial class AuthorizationCodeReceiver : IDisposable
                 Dispose(false);
             }
 
-            /// <inheritdoc />
+            /// <summary>
+            /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+            /// </summary>
             public void Dispose()
             {
                 Dispose(true);
@@ -499,7 +501,9 @@ public abstract partial class AuthorizationCodeUserAgent : IDisposable
                 Dispose(false);
             }
 
-            /// <inheritdoc />
+            /// <summary>
+            /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+            /// </summary>
             public void Dispose()
             {
                 Dispose(true);

diff --git a/source/Htc.Vita.Core/Auth/OAuth2.Factory.cs b/source/Htc.Vita.Core/Auth/OAuth2.Factory.cs
@@ -160,7 +160,7 @@ static ClientFactory()
             /// </summary>
             /// <typeparam name="T"></typeparam>
             public static void Register<T>()
-                where T : ClientFactory, new()
+                    where T : ClientFactory, new()
             {
                 TypeRegistry.Register<ClientFactory, T>();
             }
@@ -180,7 +180,7 @@ public static ClientFactory GetInstance()
             /// <typeparam name="T"></typeparam>
             /// <returns>ClientFactory.</returns>
             public static ClientFactory GetInstance<T>()
-                where T : ClientFactory, new()
+                    where T : ClientFactory, new()
             {
                 return TypeRegistry.GetInstance<ClientFactory, T>();
             }

diff --git a/source/Htc.Vita.Core/IO/UsbWatcher.cs b/source/Htc.Vita.Core/IO/UsbWatcher.cs
@@ -34,7 +34,9 @@ public abstract class UsbWatcher : IDisposable
             Dispose(false);
         }
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// </summary>
         public void Dispose()
         {
             Dispose(true);

diff --git a/source/Htc.Vita.Core/Net/DefaultWebProxyFactory.cs b/source/Htc.Vita.Core/Net/DefaultWebProxyFactory.cs
@@ -43,14 +43,14 @@ protected override IWebProxy OnGetWebProxy()
         {
             const string valueName = "Proxy";
             var webProxyUri = ParseWebProxyUri(
-                    Registry.GetStringValue(
-                            Registry.Hive.CurrentUser,
+                    Win32Registry.GetStringValue(
+                            Win32Registry.Hive.CurrentUser,
                             RegistryKeyPath,
                             valueName
                     )
             ) ?? ParseWebProxyUri(
-                    Registry.GetStringValue(
-                            Registry.Hive.LocalMachine,
+                    Win32Registry.GetStringValue(
+                            Win32Registry.Hive.LocalMachine,
                             RegistryKeyPath,
                             valueName
                     )

diff --git a/source/Htc.Vita.Core/Util/Registry.cs b/source/Htc.Vita.Core/Util/Registry.cs
@@ -6,6 +6,7 @@ namespace Htc.Vita.Core.Util
     /// <summary>
     /// Class Registry.
     /// </summary>
+    [Obsolete("This class is obsoleted. Use Win32Registry instead.")]
     public abstract class Registry
     {
         /// <summary>
@@ -271,7 +272,6 @@ public static int GetDwordValue64(Hive root, string keyPath, string valueName, i
         /// <param name="keyPath">The key path.</param>
         /// <param name="valueName">Name of the value.</param>
         /// <returns>System.Int32.</returns>
-        [Obsolete("This method is obsoleted. Use Win32Registry.GetIntValue() instead.")]
         public static int GetIntValue(Hive root, string keyPath, string valueName)
         {
             return GetIntValue(root, keyPath, valueName, 0);

diff --git a/source/Htc.Vita.Core/Util/Win32Registry.Key.cs b/source/Htc.Vita.Core/Util/Win32Registry.Key.cs
@@ -1110,13 +1110,13 @@ public Key OpenSubKey(string subKeyName)
                 {
                     _handle.SetHandleAsInvalid();
                     _handle = null;
-                    throw new IOException("Unexpected error: " + errorCode, (int)errorCode);
+                    throw new IOException($"Unexpected error: {errorCode}", (int)errorCode);
                 }
                 if (errorCode == Windows.Error.FileNotFound)
                 {
                     throw new IOException("The specified registry key does not exist.", (int)errorCode);
                 }
-                throw new IOException("Unexpected error: " + errorCode, (int)errorCode);
+                throw new IOException($"Unexpected error: {errorCode}", (int)errorCode);
             }
 
             private static Windows.RegistryKeyAccessRights ToRegistryKeyAccessRight(bool isWritable)