Revert updates to version comparison - issue with ARG (#971)

Co-authored-by: Anthony Watherston <Anthony.Watherston@microsoft.com>

Author: anwather

Scripts/Helpers/Confirm-PolicyDefinitionsInPolicySetMatch.ps1

@@ -42,37 +42,37 @@ function Confirm-PolicyDefinitionsInPolicySetMatch {
 
             # Validate the Azure definitionVersion with the local definitionVersion, if the local definitionVersion doesn't exist and the Azure definitionVersion is not equal to latest policy version then return false
             # This addresses an error that occurs when there is a null value in the definitionVersion field that cropped up when we removed the variable prior to processing to fix a bug spotted in Build-HydrationDeploymentPlans where the values were retained, and adversely affecting the update information.
-            try {
-                if ($null -eq $item1.definitionVersion -and $null -eq $item2.definitionVersion) {
-                    # Compare-SemanticVersion -Version1 0 -Version2 0 is always 0, so we forego the calculation and set it
-                    $definitionVersionMatches = 0
-                }
-                elseif ($null -eq $item1.definitionVersion) {
-                    # Compare-SemanticVersion -Version1 0 -Version2 (anything not 0) is always -1, so we forego the calculation and set it
-                    # $definitionVersionMatches = Compare-SemanticVersion -Version1 0 -Version2 $item2.definitionVersion
-                    $definitionVersionMatches = -1
-                }
-                elseif ($null -eq $item2.definitionVersion) {
-                    # Compare-SemanticVersion -Version1 (anything not 0) -Version2 0 is always 1, so we forego the calculation and set it
-                    # $definitionVersionMatches = Compare-SemanticVersion -Version1 $item1.definitionVersion -Version2 0
-                    $definitionVersionMatches = 1
-                }               
-                else {
-                    # If neither of the definitionVersion values are null, then the compare can proceed without error
-                    $definitionVersionMatches = Compare-SemanticVersion -Version1 $($item1.definitionVersion ?? $Definitions[$item1.policyDefinitionId].properties.version ?? '1.*.*') -Version2 $($item2.definitionVersion ?? $Definitions[$item1.policyDefinitionId].properties.version ?? '1.*.*')
-                }
-            }
-            catch {
-                Write-Information "Comparison has generated an error."
-                Write-Information "Item1: $($item1.policyDefinitionId) $($item1.policySetDefinitionId) $($item1.policyDefinitionName) $($item1.policySetDefinitionName)"
-                Write-Information "Item2: $($item2.policyDefinitionId) $($item2.policySetDefinitionId) $($item2.policyDefinitionName) $($item2.policySetDefinitionName)"
-                continue
-            }
-            if ($definitionVersionMatches -ne 0) {
-                Write-Verbose "Definition Id: $($item1.policyDefinitionId)"
-                Write-Verbose "DefinitionVersion does not match: Azure: $($item1.definitionVersion), Local: $($item2.definitionVersion)"
-                return $false
-            }
+            # try {
+            #     if ($null -eq $item1.definitionVersion -and $null -eq $item2.definitionVersion) {
+            #         # Compare-SemanticVersion -Version1 0 -Version2 0 is always 0, so we forego the calculation and set it
+            #         $definitionVersionMatches = 0
+            #     }
+            #     elseif ($null -eq $item1.definitionVersion) {
+            #         # Compare-SemanticVersion -Version1 0 -Version2 (anything not 0) is always -1, so we forego the calculation and set it
+            #         # $definitionVersionMatches = Compare-SemanticVersion -Version1 0 -Version2 $item2.definitionVersion
+            #         $definitionVersionMatches = -1
+            #     }
+            #     elseif ($null -eq $item2.definitionVersion) {
+            #         # Compare-SemanticVersion -Version1 (anything not 0) -Version2 0 is always 1, so we forego the calculation and set it
+            #         # $definitionVersionMatches = Compare-SemanticVersion -Version1 $item1.definitionVersion -Version2 0
+            #         $definitionVersionMatches = 1
+            #     }               
+            #     else {
+            #         # If neither of the definitionVersion values are null, then the compare can proceed without error
+            #         $definitionVersionMatches = Compare-SemanticVersion -Version1 $($item1.definitionVersion ?? $Definitions[$item1.policyDefinitionId].properties.version ?? '1.*.*') -Version2 $($item2.definitionVersion ?? $Definitions[$item1.policyDefinitionId].properties.version ?? '1.*.*')
+            #     }
+            # }
+            # catch {
+            #     Write-Information "Comparison has generated an error."
+            #     Write-Information "Item1: $($item1.policyDefinitionId) $($item1.policySetDefinitionId) $($item1.policyDefinitionName) $($item1.policySetDefinitionName)"
+            #     Write-Information "Item2: $($item2.policyDefinitionId) $($item2.policySetDefinitionId) $($item2.policyDefinitionName) $($item2.policySetDefinitionName)"
+            #     continue
+            # }
+            # if ($definitionVersionMatches -ne 0) {
+            #     Write-Verbose "Definition Id: $($item1.policyDefinitionId)"
+            #     Write-Verbose "DefinitionVersion does not match: Azure: $($item1.definitionVersion), Local: $($item2.definitionVersion)"
+            #     return $false
+            # }
 
             $groupNames1 = $item1.groupNames
             $groupNames2 = $item2.groupNames