Merge pull request #64 from Particular/warning-obsolete

Particular · Dec 1, 2020 · 9060ece · 9060ece
2 parents c28e19e + b2fbc6e
commit 9060ece
Show file tree

Hide file tree

Showing 4 changed files with 901 additions and 954 deletions.
diff --git a/src/NServiceBus.PowerShell/Cmdlets/InstallPlatformLicense.cs b/src/NServiceBus.PowerShell/Cmdlets/InstallPlatformLicense.cs
@@ -9,6 +9,7 @@
     using RegistryView = Helpers.RegistryView;
 
     [Cmdlet(VerbsLifecycle.Install, "NServiceBusPlatformLicense", DefaultParameterSetName = "ByLicenseFile")]
+    [Obsolete(@"Installing license information in the registry has been deprecated as the Particular Platform reads license info from file system. For legacy installations this cmdlet can still be used. See https://docs.particular.net/search?q=license.")]
     public class InstallPlatformLicense : CmdletBase
     {
         [Parameter(Mandatory = true, HelpMessage = "Platform license file to import", Position = 0, ParameterSetName = "ByLicenseFile")]
@@ -19,6 +20,11 @@ public class InstallPlatformLicense : CmdletBase
         [ValidateNotNullOrEmpty]
         public string LicenseString { get; set; }
 
+        protected override void BeginProcessing()
+        {
+            WriteWarning("Installing license information in the registry has been deprecated as the Particular Platform reads license info from file system. For legacy installations this cmdlet can still be used. See https://docs.particular.net/search?q=license.");
+        }
+
         protected override void ProcessRecord()
         {
             const string particular = @"Software\ParticularSoftware";

diff --git a/src/NServiceBus.PowerShell/Helpers/RegistryHelper.cs b/src/NServiceBus.PowerShell/Helpers/RegistryHelper.cs
@@ -323,8 +323,7 @@ public object ReadValue(string subKeyName, string valueName, object defaultValue
                             var cur = 0;
                             var len = blob.Length;
 
-                            // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-                            while (ret == 0 && cur < len)
+                            while (cur < len)
                             {
                                 var nextNull = cur;
                                 while (nextNull < len && blob[nextNull] != (char) 0)
@@ -350,7 +349,6 @@ public object ReadValue(string subKeyName, string valueName, object defaultValue
                                 }
                                 cur = nextNull + 1;
                             }
-                            // ReSharper enable once ConditionIsAlwaysTrueOrFalse
 
                             data = new String[strings.Count];
                             strings.CopyTo((String[]) data, 0);
@@ -589,4 +587,4 @@ public RegistryValueKind GetRegistryValueKind(string subKeyName, string valueNam
             }
         }
     }
-}
+}