[edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: Make Installer use ProductCode from Vendor Customizer

Nate DeSimone posted 1 patch 2 weeks ago
Failed in applying to current master (apply log)
edkrepo_installer/EdkRepoInstaller/App.xaml.cs | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)

[edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: Make Installer use ProductCode from Vendor Customizer

Posted by Nate DeSimone 2 weeks ago
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Ashley E Desimone <ashley.e.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
---
 edkrepo_installer/EdkRepoInstaller/App.xaml.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/edkrepo_installer/EdkRepoInstaller/App.xaml.cs b/edkrepo_installer/EdkRepoInstaller/App.xaml.cs
index 3e56f60..58186c9 100644
--- a/edkrepo_installer/EdkRepoInstaller/App.xaml.cs
+++ b/edkrepo_installer/EdkRepoInstaller/App.xaml.cs
@@ -214,7 +214,15 @@ namespace TianoCore.EdkRepoInstaller
 
         private bool FoundVendorCustomizedEdkRepoAlreadyInstalled(out RegistryKey FoundVendorUninstallKey)
         {
-            string ProductCode = InstallerStrings.ProductCode;
+            string ProductCode = null;
+            if (VendorCustomizer.Instance != null)
+            {
+                ProductCode = VendorCustomizer.Instance.ProductCode;
+            }
+            else
+            {
+                ProductCode = InstallerStrings.ProductCode;
+            }
             RegistryKey hklm = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry64);
             RegistryKey winUninstallRegistryKey = hklm.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall", true);
             foreach (string VendorCustomizerProductCode in InstallerStrings.KnownVendorProductCodes)
-- 
2.23.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#49683): https://edk2.groups.io/g/devel/message/49683
Mute This Topic: https://groups.io/mt/40038557/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-staging/EdkRepo] [PATCH] EdkRepo: Make Installer use ProductCode from Vendor Customizer

Posted by Desimone, Ashley E 2 weeks ago
Reviewed-by: Ashley DeSimone <ashley.e.desimone@intel.com>

-----Original Message-----
From: Desimone, Nathaniel L 
Sent: Wednesday, October 30, 2019 4:49 PM
To: devel@edk2.groups.io
Cc: Desimone, Ashley E <ashley.e.desimone@intel.com>; Pandya, Puja <puja.pandya@intel.com>
Subject: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Make Installer use ProductCode from Vendor Customizer

Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Ashley E Desimone <ashley.e.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
---
 edkrepo_installer/EdkRepoInstaller/App.xaml.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/edkrepo_installer/EdkRepoInstaller/App.xaml.cs b/edkrepo_installer/EdkRepoInstaller/App.xaml.cs
index 3e56f60..58186c9 100644
--- a/edkrepo_installer/EdkRepoInstaller/App.xaml.cs
+++ b/edkrepo_installer/EdkRepoInstaller/App.xaml.cs
@@ -214,7 +214,15 @@ namespace TianoCore.EdkRepoInstaller
 

         private bool FoundVendorCustomizedEdkRepoAlreadyInstalled(out RegistryKey FoundVendorUninstallKey)

         {

-            string ProductCode = InstallerStrings.ProductCode;

+            string ProductCode = null;

+            if (VendorCustomizer.Instance != null)

+            {

+                ProductCode = VendorCustomizer.Instance.ProductCode;

+            }

+            else

+            {

+                ProductCode = InstallerStrings.ProductCode;

+            }

             RegistryKey hklm = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry64);

             RegistryKey winUninstallRegistryKey = hklm.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall", true);

             foreach (string VendorCustomizerProductCode in InstallerStrings.KnownVendorProductCodes)

-- 
2.23.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#49782): https://edk2.groups.io/g/devel/message/49782
Mute This Topic: https://groups.io/mt/40038557/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-