check reg value to use Get-ItemPropertyValue

check for a reg value will now use Get-ItemPropertyValue instead of Get-ItemProperty
rzander · Jan 3, 2018 · 6b17168 · 6b17168
1 parent d2c8575
commit 6b17168
Show file tree

Hide file tree

Showing 18 changed files with 367 additions and 283 deletions.
diff --git a/Source/REG2CI/Program.cs b/Source/REG2CI/Program.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Xml;
 using System.IO;
 using System.Diagnostics;
 
@@ -14,7 +12,7 @@ static int Main(string[] args)
         {
             bool bX64 = true;
             List<string> lArgs = args.ToList();
-            Console.WriteLine("****** Reg2CI (c) 2017 by Roger Zander ******");
+            Console.WriteLine("****** Reg2CI (c) 2018 by Roger Zander ******");
             if(lArgs.Count == 0 || lArgs.Contains("-?") || lArgs.Contains("/?"))
             {
                 Console.WriteLine("Usage: Reg2CI.exe <Reg File> <Cab File> <Name of the CI> [/X86]");

diff --git a/Source/REG2CI/Properties/AssemblyInfo.cs b/Source/REG2CI/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Zander Tools")]
 [assembly: AssemblyProduct("REG2CI")]
-[assembly: AssemblyCopyright("Copyright ©  2017 by Roger Zander")]
+[assembly: AssemblyCopyright("Copyright ©  2018 by Roger Zander")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.7.3.*")]
-[assembly: AssemblyFileVersion("0.7.3.2")]
+[assembly: AssemblyVersion("0.7.4.*")]
+[assembly: AssemblyFileVersion("0.7.4.0")]
diff --git a/Source/REG2CI/RegClass.cs b/Source/REG2CI/RegClass.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using System.IO;
 using System.Xml;
 
@@ -17,7 +16,7 @@ public class RegFile
         public static bool bPSScript = true;
         public static XmlDocument xDoc = new XmlDocument();
         internal static string LogicalName = "";
-        public string Description = "Reg2CI (c) 2017 by Roger Zander";
+        public string Description = "Reg2CI (c) 2018 by Roger Zander";
 
         public RegFile(string fileName, string CIName)
         {
@@ -471,17 +470,17 @@ public string PSCheck
 
                         if (DataType == ValueType.Binary)
                         {
-                            return "if((Get-ItemProperty -Path '{PATH}' -Name '{NAME}' -ea SilentlyContinue).'{NAME}' -join ',' -eq ({VALUE} -join ',')) { $true } else { $false }".Replace("{PATH}", PSHive + "\\" + Path).Replace("{NAME}", Name).Replace("{VALUE}", _svalue);
+                            return "if((Get-ItemPropertyValue -Path '{PATH}' -Name '{NAME}' -ea SilentlyContinue) -join ',' -eq ({VALUE} -join ',')) { $true } else { $false }".Replace("{PATH}", PSHive + "\\" + Path).Replace("{NAME}", Name).Replace("{VALUE}", _svalue);
                         }
 
                         if (DataType == ValueType.MultiString)
                         {
-                            return "if((Get-ItemProperty -Path '{PATH}' -Name '{NAME}' -ea SilentlyContinue).'{NAME}' -join ',' -eq {VALUE}) { $true } else { $false }".Replace("{PATH}", PSHive + "\\" + Path).Replace("{NAME}", Name).Replace("{VALUE}", _svalue);
+                            return "if((Get-ItemPropertyValue -Path '{PATH}' -Name '{NAME}' -ea SilentlyContinue) -join ',' -eq {VALUE}) { $true } else { $false }".Replace("{PATH}", PSHive + "\\" + Path).Replace("{NAME}", Name).Replace("{VALUE}", _svalue);
                         }
 
                         string sResult = _svalue.Replace(@"\""", @"`""");
-                        return "if((Get-ItemProperty -Path '{PATH}' -Name '{NAME}' -ea SilentlyContinue).'{NAME}' -eq {VALUE}) { $true } else { $false }".Replace("{PATH}", PSHive + "\\" + Path).Replace("{NAME}", Name).Replace("{VALUE}", sResult);
-
+                        //return "if((Get-ItemProperty -Path '{PATH}' -Name '{NAME}' -ea SilentlyContinue).'{NAME}' -eq {VALUE}) { $true } else { $false }".Replace("{PATH}", PSHive + "\\" + Path).Replace("{NAME}", Name).Replace("{VALUE}", sResult);
+                        return "if((Get-ItemPropertyValue -Path '{PATH}' -Name '{NAME}' -ea SilentlyContinue) -eq {VALUE}) { $true } else { $false }".Replace("{PATH}", PSHive + "\\" + Path).Replace("{NAME}", Name).Replace("{VALUE}", sResult);
                     }
                     else
                     {

diff --git a/Source/REG2PS/Default.Master b/Source/REG2PS/Default.Master
@@ -34,7 +34,7 @@
     <meta name="description" content="Convert PowerShell scripts into Windows executables." />
     <meta name="keywords" content="Powershell, PoSh, registry, convert, reg, ps1, script" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <script type="text/javascript" src="Scripts/jquery-3.1.1.min.js"></script>
+    <script type="text/javascript" src="Scripts/jquery-3.2.1.min.js"></script>
     <script type="text/javascript" src="Scripts/bootstrap.min.js"></script>
     <link rel="stylesheet" href="Content/bootstrap.css" />
 
@@ -47,14 +47,14 @@
         </asp:ScriptManager>
         <div class="container">
             <h1>Registry to PowerShell converter</h1>
-            <p class="text-muted"><sup>Version 1.0.2.2 (1.July.2017)</sup></p>
+            <p class="text-muted"><sup>Version 1.0.3.0 (3.Jan.2018)</sup></p>
         </div>
         <asp:ContentPlaceHolder ID="ContentPlaceHolder1" runat="server">
         </asp:ContentPlaceHolder>
     </form>
     <footer class="rfooter">
         <div class="container">
-            <p class="text-muted"><a href="https://github.com/rzander/REG2CI/" title="REG2PS on GitHub">REG2PS on GitHub...</a> Copyright © 2017 by Roger Zander</p>
+            <p class="text-muted"><a href="https://github.com/rzander/REG2CI/" title="REG2PS on GitHub">REG2PS on GitHub...</a> Copyright © 2018 by Roger Zander</p>
         </div>
     </footer>
 </body>

diff --git a/Source/REG2PS/Properties/AssemblyInfo.cs b/Source/REG2PS/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("REG2PS")]
-[assembly: AssemblyCopyright("Copyright ©  2017 by Roger Zander")]
+[assembly: AssemblyCopyright("Copyright ©  2018 by Roger Zander")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.2.2")]
-[assembly: AssemblyFileVersion("1.0.2.2")]
+[assembly: AssemblyVersion("1.0.3.0")]
+[assembly: AssemblyFileVersion("1.0.3.0")]
diff --git a/Source/REG2PS/RegClass.cs b/Source/REG2PS/RegClass.cs
@@ -16,7 +16,7 @@ public class RegFile
         public static bool bPSScript = true;
         public static XmlDocument xDoc = new XmlDocument();
         internal static string LogicalName = "";
-        public string Description = "Reg2CI (c) 2017 by Roger Zander";
+        public string Description = "Reg2CI (c) 2018 by Roger Zander";
 
         public RegFile(string fileName, string CIName)
         {
@@ -451,16 +451,17 @@ public string PSCheck
 
                         if (DataType == ValueType.Binary)
                         {
-                            return "if((Get-ItemProperty -Path '{PATH}' -Name '{NAME}' -ea SilentlyContinue).'{NAME}' -join ',' -eq ({VALUE} -join ',')) { $true } else { $false }".Replace("{PATH}", PSHive + "\\" + Path).Replace("{NAME}", Name).Replace("{VALUE}", _svalue);
+                            return "if((Get-ItemPropertyValue -Path '{PATH}' -Name '{NAME}' -ea SilentlyContinue) -join ',' -eq ({VALUE} -join ',')) { $true } else { $false }".Replace("{PATH}", PSHive + "\\" + Path).Replace("{NAME}", Name).Replace("{VALUE}", _svalue);
                         }
 
                         if (DataType == ValueType.MultiString)
                         {
-                            return "if((Get-ItemProperty -Path '{PATH}' -Name '{NAME}' -ea SilentlyContinue).'{NAME}' -join ',' -eq {VALUE}) { $true } else { $false }".Replace("{PATH}", PSHive + "\\" + Path).Replace("{NAME}", Name).Replace("{VALUE}", _svalue);
+                            return "if((Get-ItemPropertyValue -Path '{PATH}' -Name '{NAME}' -ea SilentlyContinue) -join ',' -eq {VALUE}) { $true } else { $false }".Replace("{PATH}", PSHive + "\\" + Path).Replace("{NAME}", Name).Replace("{VALUE}", _svalue);
                         }
 
                         string sResult = _svalue.Replace(@"\""", @"`""");
-                        return "if((Get-ItemProperty -Path '{PATH}' -Name '{NAME}' -ea SilentlyContinue).'{NAME}' -eq {VALUE}) { $true } else { $false }".Replace("{PATH}", PSHive + "\\" + Path).Replace("{NAME}", Name).Replace("{VALUE}", sResult);
+                        //return "if((Get-ItemProperty -Path '{PATH}' -Name '{NAME}' -ea SilentlyContinue).'{NAME}' -eq {VALUE}) { $true } else { $false }".Replace("{PATH}", PSHive + "\\" + Path).Replace("{NAME}", Name).Replace("{VALUE}", sResult);
+                        return "if((Get-ItemPropertyValue -Path '{PATH}' -Name '{NAME}' -ea SilentlyContinue) -eq {VALUE}) { $true } else { $false }".Replace("{PATH}", PSHive + "\\" + Path).Replace("{NAME}", Name).Replace("{VALUE}", sResult);
                     }
                     else
                     {

diff --git a/Source/REG2PS/Scripts/jquery-3.1.1.min.js b/Source/REG2PS/Scripts/jquery-3.1.1.min.js
diff --git a/Source/REG2PS/Scripts/jquery-3.1.1.min.map b/Source/REG2PS/Scripts/jquery-3.1.1.min.map
diff --git a/Source/REG2PS/Scripts/jquery-3.1.1.slim.min.js b/Source/REG2PS/Scripts/jquery-3.1.1.slim.min.js
diff --git a/Source/REG2PS/Scripts/jquery-3.1.1.slim.min.map b/Source/REG2PS/Scripts/jquery-3.1.1.slim.min.map
diff --git a/...G2PS/Scripts/jquery-3.1.1.intellisense.js → ...G2PS/Scripts/jquery-3.2.1.intellisense.js b/...G2PS/Scripts/jquery-3.1.1.intellisense.js → ...G2PS/Scripts/jquery-3.2.1.intellisense.js