Merge pull request hmscott4#22 from randomnote1/FixSingleQuoteLookupError

Fix single quote lookup error

Author: randomnote1

.github/workflows/build.yml

@@ -4,6 +4,12 @@ name: Build Management Pack
 on:
   # Triggers the workflow on push or pull request
   push:
+    branches:
+      - '*'         # matches every branch that doesn't contain a '/'
+      - '*/*'       # matches every branch containing a single '/'
+      - '**'        # matches every branch
+      - '!dev'      # excludes dev
+      - '!main'     # excludes main
   pull_request:
 
   # Allows you to run this workflow manually from the Actions tab

AlertManagement/AlertManagement.mpproj

@@ -5,7 +5,7 @@
     <RootNamespace>SCOM.Alert.Management</RootNamespace>
     <Name>SCOM.Alert.Management</Name>
     <ManagementPackName>SCOM.Alert.Management</ManagementPackName>
-    <Version>1.1.31.109</Version>
+    <Version>1.2.34.112</Version>
     <MpFrameworkVersion>v7.0.2</MpFrameworkVersion>
     <MpFrameworkProfile>OM</MpFrameworkProfile>
     <ProductVersion>1.1.0.0</ProductVersion>

AlertManagement/AlertManagement.mpproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <DeploymentNextVersion>1.1.31.110</DeploymentNextVersion>
+    <DeploymentNextVersion>1.2.34.113</DeploymentNextVersion>
     <DeploymentAutoIncrementVersion>True</DeploymentAutoIncrementVersion>
     <DeploymentStartAction>None</DeploymentStartAction>
     <DeploymentWebConsoleUrl />

AlertManagement/MPResources.resources

@@ -64,18 +64,17 @@ function Format-xPathExpression
 		$Value
 	)
 
-    if ($Value.Contains("'"))
-    {
-	   return "\$Value\"
-    }
-    elseif ($Value.Contains('\'))
-    {
-	   return """$Value"""
-    }
-    else
-    {
-       return $Value;
-    }
+	$charactersToReplace = @{
+		"'" = '"'
+		'\' = '\\'
+	}
+
+	foreach ( $characterToReplace in $charactersToReplace.GetEnumerator() )
+	{
+		$Value = $Value.Replace($characterToReplace.Key, $characterToReplace.Value)
+	}
+
+    return $Value
 }
 
 # Get the config file object to ensure it exists