From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web09.290.1572479321429093396 for ; Wed, 30 Oct 2019 16:48:41 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: nathaniel.l.desimone@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Oct 2019 16:48:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,248,1569308400"; d="scan'208";a="283708739" Received: from nldesimo-desk1.amr.corp.intel.com ([10.7.159.63]) by orsmga001.jf.intel.com with ESMTP; 30 Oct 2019 16:48:40 -0700 From: "Nate DeSimone" To: devel@edk2.groups.io Cc: Ashley E Desimone , Puja Pandya Subject: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Make Installer use ProductCode from Vendor Customizer Date: Wed, 30 Oct 2019 16:48:39 -0700 Message-Id: <20191030234839.4557-1-nathaniel.l.desimone@intel.com> X-Mailer: git-send-email 2.23.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Signed-off-by: Nate DeSimone Cc: Ashley E Desimone Cc: Puja Pandya --- 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_insta= ller/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 =0D private bool FoundVendorCustomizedEdkRepoAlreadyInstalled(out Regi= stryKey FoundVendorUninstallKey)=0D {=0D - string ProductCode =3D InstallerStrings.ProductCode;=0D + string ProductCode =3D null;=0D + if (VendorCustomizer.Instance !=3D null)=0D + {=0D + ProductCode =3D VendorCustomizer.Instance.ProductCode;=0D + }=0D + else=0D + {=0D + ProductCode =3D InstallerStrings.ProductCode;=0D + }=0D RegistryKey hklm =3D RegistryKey.OpenBaseKey(RegistryHive.Loca= lMachine, RegistryView.Registry64);=0D RegistryKey winUninstallRegistryKey =3D hklm.OpenSubKey(@"SOFT= WARE\Microsoft\Windows\CurrentVersion\Uninstall", true);=0D foreach (string VendorCustomizerProductCode in InstallerString= s.KnownVendorProductCodes)=0D --=20 2.23.0.windows.1