Commit issue

Author: AngryProgrammerInside

AMPs/Update PartnerConfig from CP.amp

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?><Policy ID="614f122a-c58f-43ee-89b3-3badef635bc8" Name="Update PartnerConfig from CP" Description="UmVmcmVzaGVzIHRoZSBSZWdpc3RyYXRpb25Ub2tlbiBmb3IgaW5zdGFsbGluZyB2aWEgdGhlIE4tQ2VudHJhbCBHUE8gZnJvbSBDdXN0b21lciBQcm9wZXJ0aWVz" Version="2.10.0.19" RemoteCategory="0" ExecutionType="Local" MinimumPSVersionRequired="0.0.0">
-  <Object ID="{a77c259c-4e88-437a-8f2d-d927c1ee8653}" Type="{B6FA6D8B-EEAA-47A6-8463-7F9A4F5BBB6E}" Data="&lt;xml&gt;&lt;Parameters&gt;&lt;Parameter ParameterName=&quot;RegistrationToken&quot; Label=&quot;Registration Token&quot; ParameterType=&quot;string&quot; Value=&quot;&quot; /&gt;&lt;Parameter ParameterName=&quot;CustomerID&quot; Label=&quot;Customer ID&quot; ParameterType=&quot;string&quot; Value=&quot;&quot; /&gt;&lt;Parameter ParameterName=&quot;LocalFolder&quot; Label=&quot;Local Folder&quot; ParameterType=&quot;string&quot; Value=&quot;C:\Windows\SecurityThroughObscurity&quot; /&gt;&lt;Parameter ParameterName=&quot;NetworkFolder&quot; Label=&quot;Network Folder&quot; ParameterType=&quot;string&quot; Value=&quot;Agent&quot; /&gt;&lt;Parameter ParameterName=&quot;SOAgentFileName&quot; Label=&quot;SO Agent File Name&quot; ParameterType=&quot;string&quot; Value=&quot;WindowsAgentSetup.exe&quot; /&gt;&lt;Parameter ParameterName=&quot;SOAgentVersion&quot; Label=&quot;SO Agent Version&quot; ParameterType=&quot;string&quot; Value=&quot;2020.1.0.202&quot; /&gt;&lt;Parameter ParameterName=&quot;SOAgentFileVersion&quot; Label=&quot;SO Agent File Version&quot; ParameterType=&quot;string&quot; Value=&quot;2020.1.1202.0&quot; /&gt;&lt;Parameter ParameterName=&quot;Branding&quot; Label=&quot;Branding&quot; ParameterType=&quot;string&quot; Value=&quot;My MSP @ MSP.com&quot; /&gt;&lt;Parameter ParameterName=&quot;AzNableProxyUri&quot; Label=&quot;AzNableProxyUri&quot; ParameterType=&quot;string&quot; Value=&quot;&quot; /&gt;&lt;Parameter ParameterName=&quot;AzNableAuthCode&quot; Label=&quot;AzNableAuthCode&quot; ParameterType=&quot;string&quot; Value=&quot;&quot; /&gt;&lt;/Parameters&gt;&lt;/xml&gt;" />
+  <Object ID="{bfe4d5f8-2bb7-4c76-a258-8a87977ca882}" Type="{B6FA6D8B-EEAA-47A6-8463-7F9A4F5BBB6E}" Data="&lt;xml&gt;&lt;Parameters&gt;&lt;Parameter ParameterName=&quot;RegistrationToken&quot; Label=&quot;Registration Token&quot; ParameterType=&quot;string&quot; Value=&quot;&quot; /&gt;&lt;Parameter ParameterName=&quot;CustomerID&quot; Label=&quot;Customer ID&quot; ParameterType=&quot;string&quot; Value=&quot;&quot; /&gt;&lt;Parameter ParameterName=&quot;LocalFolder&quot; Label=&quot;Local Folder&quot; ParameterType=&quot;string&quot; Value=&quot;C:\Windows\SecurityThroughObscurity&quot; /&gt;&lt;Parameter ParameterName=&quot;NetworkFolder&quot; Label=&quot;Network Folder&quot; ParameterType=&quot;string&quot; Value=&quot;Agent&quot; /&gt;&lt;Parameter ParameterName=&quot;SOAgentFileName&quot; Label=&quot;SO Agent File Name&quot; ParameterType=&quot;string&quot; Value=&quot;WindowsAgentSetup.exe&quot; /&gt;&lt;Parameter ParameterName=&quot;SOAgentVersion&quot; Label=&quot;SO Agent Version&quot; ParameterType=&quot;string&quot; Value=&quot;2020.1.5.425&quot; /&gt;&lt;Parameter ParameterName=&quot;SOAgentFileVersion&quot; Label=&quot;SO Agent File Version&quot; ParameterType=&quot;string&quot; Value=&quot;2020.1.50425.0&quot; /&gt;&lt;Parameter ParameterName=&quot;Branding&quot; Label=&quot;Branding&quot; ParameterType=&quot;string&quot; Value=&quot;My MSP @ MSP.com&quot; /&gt;&lt;Parameter ParameterName=&quot;AzNableProxyUri&quot; Label=&quot;AzNableProxyUri&quot; ParameterType=&quot;string&quot; Value=&quot;&quot; /&gt;&lt;Parameter ParameterName=&quot;AzNableAuthCode&quot; Label=&quot;AzNableAuthCode&quot; ParameterType=&quot;string&quot; Value=&quot;&quot; /&gt;&lt;/Parameters&gt;&lt;/xml&gt;" />
   <LinkManager xmlns:i="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://schemas.datacontract.org/2004/07/PolicyExecutor">
     <hashset xmlns:d2p1="http://schemas.datacontract.org/2004/07/System" />
   </LinkManager>

Agent/PartnerConfig.xml

@@ -97,10 +97,10 @@ help@mymsp.com
       <SOAgentFileName>WindowsAgentSetup.exe</SOAgentFileName>      <!-- Default Value is WindowsAgentSetup.exe -->
       <!-- [REQUIRED - (#.#.#.#)] Desired Agent Version for Installation on systems with Current
    Agent Versions (11.0.1.xxxx and Above) -->
-      <SOAgentVersion>12.0.1.118</SOAgentVersion>
+      <SOAgentVersion>2020.1.5.425</SOAgentVersion>
       <!-- [REQUIRED - (#.#.#.#)] Windows "File Version" of the System-Level Agent Installer (from
    Properties > Details > File Version) -->
-      <SOAgentFileVersion>12.0.10118.0</SOAgentFileVersion>
+      <SOAgentFileVersion>2020.1.50425.0</SOAgentFileVersion>
       <!-- [RECOMMENDED] ### CustomerID in number format. Normally this number starts from 100. If no arguments are given to the script, or NoArgs is set to 1 in the batch, this value is REQUIRED-->
       <CustomerId></CustomerId>
       <!-- ########### Registration token is a  Base64 encoded string. This is customer specific and can has an expiration time. Check your nCentral configuration to make shure when this expires. If AzNableProxy isn't used, and it isn't passed as an argument this is REQUIRED.  -->

Customer Service Package/Agent Installer .xml

@@ -16,16 +16,16 @@ $AgentRegPath = "HKLM:\SOFTWARE\Solarwinds MSP Community\InstallAgent"
 $InstallAgentResults = ReadKey $AgentRegPath
 
 # These value is almost always present
-$AgentLastDiagnosed = $InstallAgentResults.AgentLastDiagnosed
+$AgentLastDiagnosed = if ($null -ne $InstallAgentResults.AgentLastDiagnosed) { $InstallAgentResults.AgentLastDiagnosed }else { Get-Date 1900 }
 
 # This value is present if the script has installed or upgraded at some point
-$AgentLastInstalled = $InstallAgentResults.AgentLastInstalled
+$AgentLastInstalled = if ($null -ne $InstallAgentResults.AgentLastInstalled) { $InstallAgentResults.AgentLastInstalled } else { Get-Date 1900 }
 
 # These values are always present
-$ScriptAction = $InstallAgentResults.ScriptAction
-$ScriptExitCode = $InstallAgentResults.ScriptExitCode
-$ScriptLastRan = $InstallAgentResults.ScriptLastRan
-$ScriptMode = $InstallAgentResults.ScriptMode
-$ScriptResult = $InstallAgentResults.ScriptResult
-$ScriptSequence = $InstallAgentResults.ScriptSequence
-$ScriptVersion = [int]$InstallAgentResults.ScriptVersion.Replace('.','')
+$ScriptAction = if ($null -ne $InstallAgentResults.ScriptAction) { $InstallAgentResults.ScriptAction } else { '-' }
+$ScriptExitCode = if ($null -ne $InstallAgentResults.ScriptExitCode) { $null -ne $InstallAgentResults.ScriptExitCode } else { 404 }
+$ScriptLastRan = if ($null -ne $InstallAgentResults.ScriptLastRan) { $InstallAgentResults.ScriptLastRan } else { Get-Date 1900 }
+$ScriptMode = if ($null -ne $InstallAgentResults.ScriptMode) { $InstallAgentResults.ScriptMode } else { '-' }
+$ScriptResult = if ($null -ne $InstallAgentResults.ScriptResult) { $InstallAgentResults.ScriptSequence } else { '-' }
+$ScriptSequence = if ($null -ne $InstallAgentResults.ScriptSequence) { $InstallAgentResults.ScriptSequence } else { '-' }
+$ScriptVersion = if ($null -ne $InstallAgentResults.ScriptVersion) { [int]$InstallAgentResults.ScriptVersion.Replace('.', '') } else { 404 }