1736659 - Fix `FirefoxBetaBeta` identifiers in Firefox Beta packages

Status: VERIFIED FIXED

(Firefox :: Installer, defect, P2)

Description

[Nick Alexander :nalexander [he/him]]

I got everything right in Bug 1728471 except for the branding in Firefox Beta packages, which says FirefoxBetaBeta. It's due to some confusion around trying to differentiate Release from Beta here and the way that command line parameters have evolved and grown more complex.

I'll try to sort this out before Beta 9 (in 2 days), but luckily I'm fairly confident that we're okay for Firefox Release in 94, since that doesn't trip this differentiation code path.

Comment 1

[Nick Alexander :nalexander [he/him]]

Attachment: Bug 1736659 - Fix `*BetaBeta` identifiers in Firefox Beta MSIX packages. r?bhearsum!

In automation, we specify --identity-name FirefoxBeta, which gets an
extra Beta appended.

Comment 2

[Nick Alexander :nalexander [he/him]]

Nightly try build: https://treeherder.mozilla.org/#/jobs?repo=try&revision=1ed77716f20aa7bc48835cafa5d3fdf8bd3477a1
Central as Beta try build: https://treeherder.mozilla.org/#/jobs?repo=try&revision=1ed77716f20aa7bc48835cafa5d3fdf8bd3477a1

Comment 3

[Nick Alexander :nalexander [he/him]]

The "central as beta" didn't set release-type: "beta", so that run doesn't have --channel=beta, which would show the difference. (An issue to maybe address at a later time.)

Testing locally, I have what I expect. Running the following without (BetaBeta.xml) and with (Beta.xml) the patch yields

WINDOWSSDKDIR='C:/Program Files (x86)/Windows Kits/10' ./mach repackage msix --input Firefox\ Setup\ 94.0b8.msix --channel=beta --arch=x86_64 --verbose --publisher CN=082E9164-EE6C-4EC8-B62C-441FAE7BEFA1 --publisher-display-name Mozilla --identity-name FirefoxBeta

the following sensible diff:

$ diff -U3 BetaBeta.xml Beta.xml
--- BetaBeta.xml	2021-10-20 10:30:55 -0700
+++ Beta.xml	2021-10-20 10:34:40 -0700
@@ -3,7 +3,7 @@
 - License, v. 2.0. If a copy of the MPL was not distributed with this file,
 - You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:com="http://schemas.microsoft.com/appx/manifest/com/windows10" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap2="http://schemas.microsoft.com/appx/manifest/uap/windows10/2" xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" xmlns:uap10="http://schemas.microsoft.com/appx/manifest/uap/windows10/10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap uap2 uap3 uap10 rescap">
-  <Identity Name="Mozilla.FirefoxBetaBeta" Publisher="CN=082E9164-EE6C-4EC8-B62C-441FAE7BEFA1" Version="94.0.8.0" ProcessorArchitecture="x64" />
+  <Identity Name="Mozilla.FirefoxBeta" Publisher="CN=082E9164-EE6C-4EC8-B62C-441FAE7BEFA1" Version="94.0.8.0" ProcessorArchitecture="x64" />
   <Properties>
     <DisplayName>Mozilla Firefox Beta</DisplayName>
     <PublisherDisplayName>Mozilla</PublisherDisplayName>
@@ -93,8 +93,8 @@
     <rescap:Capability Name="runFullTrust" />
   </Capabilities>
   <Applications>
-    <Application Id="FIREFOX" Executable="VFS\ProgramFiles\FirefoxBeta Beta Package Root\firefox.exe" EntryPoint="Windows.FullTrustApplication">
-      <uap:VisualElements BackgroundColor="#20123A" DisplayName="FirefoxBeta Beta" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="FirefoxBeta Beta">
+    <Application Id="FIREFOX" Executable="VFS\ProgramFiles\FirefoxBeta Package Root\firefox.exe" EntryPoint="Windows.FullTrustApplication">
+      <uap:VisualElements BackgroundColor="#20123A" DisplayName="FirefoxBeta" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="FirefoxBeta">
         <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" Square310x310Logo="Assets\LargeTile.png" Square71x71Logo="Assets\SmallTile.png" />
       </uap:VisualElements>
       <Extensions>
@@ -143,10 +143,10 @@
       <com:ComInterface>
         <com:ProxyStub DisplayName="AccessibleHandler"
                        Id="b32983ff-ef84-4945-8f86-fb7491b4f57b"
-                       Path="VFS\ProgramFiles\FirefoxBeta Beta Package Root\AccessibleHandler.dll" />
+                       Path="VFS\ProgramFiles\FirefoxBeta Package Root\AccessibleHandler.dll" />
         <com:ProxyStub DisplayName="AccessibleMarshal"
                        Id="1814ceeb-49e2-407f-af99-fa755a7d2607"
-                       Path="VFS\ProgramFiles\FirefoxBeta Beta Package Root\AccessibleMarshal.dll" />
+                       Path="VFS\ProgramFiles\FirefoxBeta Package Root\AccessibleMarshal.dll" />
         <com:Interface Id="b32983ff-ef84-4945-8f86-fb7491b4f57b"
                        ProxyStubClsid="b32983ff-ef84-4945-8f86-fb7491b4f57b" />
         <com:Interface Id="4e747be5-2052-4265-8af0-8ecad7aad1c0"

Comment 4

[Nick Alexander :nalexander [he/him]]

Comment on attachment 9246760 [details]
Bug 1736659 - Fix *BetaBeta identifiers in Firefox Beta MSIX packages. r?bhearsum!

Beta/Release Uplift Approval Request

• User impact if declined: None. This is a follow-up to https://bugzilla.mozilla.org/show_bug.cgi?id=1728471, which simply makes Relman's life easier. See https://bugzilla.mozilla.org/show_bug.cgi?id=1728471#c18.
• Is this code covered by automated tests?: No
• Has the fix been verified in Nightly?: No
• Needs manual test from QE?: Yes
• If yes, steps to reproduce: Upon uplift to Beta, the next Beta will produce a target.store.msix. I (:nalexander) or relman (:RyanVM) will upload that MSIX to the Microsoft Store for testing. If the Store accepts the package, then we'll know the metadata as produced by this patch is correct. QE can verify by installing the updated version from the Store. (Doing this process is how I discovered the error fixed in this ticket.)
• List of other uplifts needed: None
• Risk to taking this patch: Low
• Why is the change risky/not risky? (and alternatives if risky): This impacts only MSIX production, and nothing is relying on these MSIX packages yet; and yet further, only the beta channel's MSIX packages.
• String changes made/needed:

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/8e8fe8bffa97
Fix `*BetaBeta` identifiers in Firefox Beta MSIX packages. r=bhearsum

Comment 6

[Norisz Fay [:noriszfay]]

https://hg.mozilla.org/mozilla-central/rev/8e8fe8bffa97

Comment 7

[Ryan VanderMeulen [:RyanVM]]

Comment on attachment 9246760 [details]
Bug 1736659 - Fix *BetaBeta identifiers in Firefox Beta MSIX packages. r?bhearsum!

Approved for 94.0b9.

Comment 8

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/releases/mozilla-beta/rev/b5aa141e4a0d

Comment 9

[Catalin Sasca, Desktop QA [:csasca]]

We can close this issue as the regression will be worked on Bug 1737752.