From f6e5e8639c094010942557db4385f73219c6da7b Mon Sep 17 00:00:00 2001
From: Jacob Affinito <jaffinito@newrelic.com>
Date: Tue, 27 Jun 2023 13:06:09 -0700
Subject: [PATCH 1/2] fix: Update license font in MSI to better fit inside UI.

---
 licenses/LICENSE.rtf | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/licenses/LICENSE.rtf b/licenses/LICENSE.rtf
index 772933d7f8..fbb3c971df 100644
--- a/licenses/LICENSE.rtf
+++ b/licenses/LICENSE.rtf
@@ -1,9 +1,9 @@
-{\rtf1\ansi\deff0\nouicompat{\fonttbl{\f0\fnil\fcharset0 Courier New;}}
+{\rtf1\ansi\ansicpg1252\deff0\nouicompat{\fonttbl{\f0\fnil\fcharset0 Arial;}}
 {\colortbl ;\red0\green0\blue255;}
-{\*\generator Riched20 10.0.19041}\viewkind4\uc1 
-\pard\f0\fs22\lang1033                                  Apache License\par
+{\*\generator Riched20 10.0.22621}\viewkind4\uc1 
+\pard\fs16\lang1033                                  Apache License\par
                            Version 2.0, January 2004\par
-                        {{\field{\*\fldinst{HYPERLINK http://www.apache.org/licenses/ }}{\fldrslt{http://www.apache.org/licenses/\ul0\cf0}}}}\f0\fs22\par
+                        {{\field{\*\fldinst{HYPERLINK http://www.apache.org/licenses/ }}{\fldrslt{http://www.apache.org/licenses/\ul0\cf0}}}}\f0\fs16\par
 \par
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\par
 \par
@@ -195,7 +195,7 @@
    you may not use this file except in compliance with the License.\par
    You may obtain a copy of the License at\par
 \par
-       {{\field{\*\fldinst{HYPERLINK http://www.apache.org/licenses/LICENSE-2.0 }}{\fldrslt{http://www.apache.org/licenses/LICENSE-2.0\ul0\cf0}}}}\f0\fs22\par
+       {{\field{\*\fldinst{HYPERLINK http://www.apache.org/licenses/LICENSE-2.0 }}{\fldrslt{http://www.apache.org/licenses/LICENSE-2.0\ul0\cf0}}}}\f0\fs16\par
 \par
    Unless required by applicable law or agreed to in writing, software\par
    distributed under the License is distributed on an "AS IS" BASIS,\par

From 254887dec96df50bfd51db213f0e46ea1ea9edda Mon Sep 17 00:00:00 2001
From: Jacob Affinito <jaffinito@newrelic.com>
Date: Tue, 27 Jun 2023 13:09:14 -0700
Subject: [PATCH 2/2] fix: Update the MSI feature selection to improve
 readability.

---
 src/Agent/MsiInstaller/Installer/LicenseKeyDialog.wxs | 2 +-
 src/Agent/MsiInstaller/Installer/WizardUI.wxs         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Agent/MsiInstaller/Installer/LicenseKeyDialog.wxs b/src/Agent/MsiInstaller/Installer/LicenseKeyDialog.wxs
index 0a827316df..8e048ccc43 100644
--- a/src/Agent/MsiInstaller/Installer/LicenseKeyDialog.wxs
+++ b/src/Agent/MsiInstaller/Installer/LicenseKeyDialog.wxs
@@ -23,7 +23,7 @@ SPDX-License-Identifier: Apache-2.0
           <Publish Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
         </Control>
         <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="&amp;Next">
-          <Publish Event="NewDialog" Value="CustomizeDlg"><![CDATA[NR_LICENSE_KEY <> "                                        "]]></Publish>
+          <Publish Event="NewDialog" Value="FeaturesDlg"><![CDATA[NR_LICENSE_KEY <> "                                        "]]></Publish>
         </Control>
         <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="Cancel">
           <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
diff --git a/src/Agent/MsiInstaller/Installer/WizardUI.wxs b/src/Agent/MsiInstaller/Installer/WizardUI.wxs
index 08881a4241..ae6cfb68a3 100644
--- a/src/Agent/MsiInstaller/Installer/WizardUI.wxs
+++ b/src/Agent/MsiInstaller/Installer/WizardUI.wxs
@@ -14,13 +14,13 @@ SPDX-License-Identifier: Apache-2.0
       <!-- Try to get the license key from a previous install. -->
       <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="DoAction" Value="FindPreviousLicenseKey" Order="1">1</Publish>
       <!-- If there was a previous license key found and they have accepted the agreement, then go on to the customize dialog (skip license key input). -->
-      <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="CustomizeDlg" Order="2">PREVLICENSEKEYFOUND AND LicenseAccepted = "1"</Publish>
+      <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="FeaturesDlg" Order="2">PREVLICENSEKEYFOUND AND LicenseAccepted = "1"</Publish>
       <!-- If a previous license key was not found then prompt for the license key next. -->
       <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="LicenseKeyDialog" Order="3">NOT PREVLICENSEKEYFOUND AND LicenseAccepted = "1"</Publish>
       <!-- If a previous license key was not found then the back button from customize goes to the license key dialog. -->
-      <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="LicenseKeyDialog" Order="2">NOT Installed AND NOT PREVLICENSEKEYFOUND</Publish>
+      <Publish Dialog="FeaturesDlg" Control="Back" Event="NewDialog" Value="LicenseKeyDialog" Order="2">NOT Installed AND NOT PREVLICENSEKEYFOUND</Publish>
       <!-- If a previous license key was found then the back button from customize goes to the license agreement dialog. -->
-      <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg" Order="2">NOT Installed AND PREVLICENSEKEYFOUND</Publish>
+      <Publish Dialog="FeaturesDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg" Order="2">NOT Installed AND PREVLICENSEKEYFOUND</Publish>
     </UI>
   </Fragment>
 </Wix>