* [edk2-staging/EdkRepo] [PATCH] EdkRepo: Make Installer use ProductCode from Vendor Customizer
@ 2019-10-30 23:48 Nate DeSimone
2019-10-31 22:47 ` Desimone, Ashley E
0 siblings, 1 reply; 2+ messages in thread
From: Nate DeSimone @ 2019-10-30 23:48 UTC (permalink / raw)
To: devel; +Cc: Ashley E Desimone, Puja Pandya
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
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Make Installer use ProductCode from Vendor Customizer
2019-10-30 23:48 [edk2-staging/EdkRepo] [PATCH] EdkRepo: Make Installer use ProductCode from Vendor Customizer Nate DeSimone
@ 2019-10-31 22:47 ` Desimone, Ashley E
0 siblings, 0 replies; 2+ messages in thread
From: Desimone, Ashley E @ 2019-10-31 22:47 UTC (permalink / raw)
To: Desimone, Nathaniel L, devel@edk2.groups.io; +Cc: Pandya, Puja
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-10-31 22:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-30 23:48 [edk2-staging/EdkRepo] [PATCH] EdkRepo: Make Installer use ProductCode from Vendor Customizer Nate DeSimone
2019-10-31 22:47 ` Desimone, Ashley E
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox