public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Desimone, Ashley E" <ashley.e.desimone@intel.com>
To: "Desimone, Nathaniel L" <nathaniel.l.desimone@intel.com>,
	"devel@edk2.groups.io" <devel@edk2.groups.io>
Cc: "Pandya, Puja" <puja.pandya@intel.com>
Subject: Re: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Make Installer use ProductCode from Vendor Customizer
Date: Thu, 31 Oct 2019 22:47:18 +0000	[thread overview]
Message-ID: <4CF3A9EB60ABDA47BE7821A4DA3A0A3353C93A7F@ORSMSX116.amr.corp.intel.com> (raw)
In-Reply-To: <20191030234839.4557-1-nathaniel.l.desimone@intel.com>

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


      reply	other threads:[~2019-10-31 22:47 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4CF3A9EB60ABDA47BE7821A4DA3A0A3353C93A7F@ORSMSX116.amr.corp.intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox