From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web11.227.1572562040949782989 for ; Thu, 31 Oct 2019 15:47:21 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: ashley.e.desimone@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Oct 2019 15:47:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,253,1569308400"; d="scan'208";a="225860622" Received: from orsmsx105.amr.corp.intel.com ([10.22.225.132]) by fmsmga004.fm.intel.com with ESMTP; 31 Oct 2019 15:47:19 -0700 Received: from orsmsx158.amr.corp.intel.com (10.22.240.20) by ORSMSX105.amr.corp.intel.com (10.22.225.132) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 31 Oct 2019 15:47:19 -0700 Received: from orsmsx116.amr.corp.intel.com ([169.254.7.79]) by ORSMSX158.amr.corp.intel.com ([169.254.10.56]) with mapi id 14.03.0439.000; Thu, 31 Oct 2019 15:47:19 -0700 From: "Desimone, Ashley E" To: "Desimone, Nathaniel L" , "devel@edk2.groups.io" CC: "Pandya, Puja" Subject: Re: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Make Installer use ProductCode from Vendor Customizer Thread-Topic: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Make Installer use ProductCode from Vendor Customizer Thread-Index: AQHVj3yP2+EgaizfxESVd1c1d08CWqd1Wz8A Date: Thu, 31 Oct 2019 22:47:18 +0000 Message-ID: <4CF3A9EB60ABDA47BE7821A4DA3A0A3353C93A7F@ORSMSX116.amr.corp.intel.com> References: <20191030234839.4557-1-nathaniel.l.desimone@intel.com> In-Reply-To: <20191030234839.4557-1-nathaniel.l.desimone@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiOTdiYmNlYzctMjQ1My00MDQzLThhNWUtYWFiMjc5MjFkNTQ0IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoidU1zOGg3Yjh5VU4xR3prN29vZkl5Y1hkNmFaRDNhQk5jQUtWV3Y0MGY5eTMwS05FeVYyRmo2azlvc3VEU3I3NiJ9 x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.22.254.139] MIME-Version: 1.0 Return-Path: ashley.e.desimone@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Ashley DeSimone -----Original Message----- From: Desimone, Nathaniel L=20 Sent: Wednesday, October 30, 2019 4:49 PM To: devel@edk2.groups.io Cc: Desimone, Ashley E ; Pandya, Puja Subject: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Make Installer use Product= Code from Vendor Customizer 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 =20 private bool FoundVendorCustomizedEdkRepoAlreadyInstalled(out Regi= stryKey FoundVendorUninstallKey) { - string ProductCode =3D InstallerStrings.ProductCode; + string ProductCode =3D null; + if (VendorCustomizer.Instance !=3D null) + { + ProductCode =3D VendorCustomizer.Instance.ProductCode; + } + else + { + ProductCode =3D InstallerStrings.ProductCode; + } RegistryKey hklm =3D RegistryKey.OpenBaseKey(RegistryHive.Loca= lMachine, RegistryView.Registry64); RegistryKey winUninstallRegistryKey =3D hklm.OpenSubKey(@"SOFT= WARE\Microsoft\Windows\CurrentVersion\Uninstall", true); foreach (string VendorCustomizerProductCode in InstallerString= s.KnownVendorProductCodes) --=20 2.23.0.windows.1