update publisher on fw lite appxmanifest

sillsdev · Oct 1, 2024 · dfd4c92 · dfd4c92
1 parent e52292a
commit dfd4c92
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 37 deletions.
diff --git a/.github/workflows/fw-lite.yaml b/.github/workflows/fw-lite.yaml
@@ -127,7 +127,7 @@ jobs:
           path: backend/FwLite/artifacts/publish/LocalWebApp/*
 
   publish-win:
-    name: Publish FW Lite app
+    name: Publish FW Lite app for Windows
 
     # only publish if tag matches fwlite-v* pattern
     # iif: startsWith(github.ref, 'refs/tags/fwlite-v')
@@ -188,6 +188,7 @@ jobs:
           file-digest: SHA256
           timestamp-rfc3161: http://timestamp.acs.microsoft.com
           timestamp-digest: SHA256
+          trace: true
 
       - name: Upload FWLite Desktop artifacts
         uses: actions/upload-artifact@v4
@@ -196,37 +197,11 @@ jobs:
           if-no-files-found: error
           path: backend/FwLite/artifacts/msix/*.msix
 
-  sign-installer:
-    #disabled as this doesn't work since ltops-signing doesn't have the signtool
-    if: false
-    name: Sign FWLite MSIX installer
-    needs: publish-win
-    runs-on: [self-hosted, ltops-signing]
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          name: fw-lite-msix
-          path: target-msix
-      - name: Sign MSIX installer
-        shell: pwsh
-        env:
-          signtool: C:/"Program Files (x86)"/"Windows Kits"/10/bin/10.0.17763.0/x86/signtool.exe
-        run: |
-          $PublicCert = [System.Convert]::FromBase64String('${{ secrets.CODESIGN_LSDEVSECTIGOEV }}')
-          Set-Content $ENV:TEMP\certificate -Value ($PublicCert) -AsByteStream
-          ${{env.signtool}} sign /f $ENV:TEMP\certificate /fd sha256 /du https://software.sil.org /tr http://timestamp.sectigo.com /td sha256 /v target-msix/*.msix
-      - name: Upload signed MSIX installer
-        uses: actions/upload-artifact@v4
-        with:
-          name: fw-lite-msix-signed
-          if-no-files-found: error
-          path: target-msix/*.msix
-
   create-release:
     #disabled since we don't have a release yet
     if: false
     name: Create Release
-    needs: sign-installer
+    needs: publish-win
     runs-on: windows-latest
 
     steps:

diff --git a/backend/FwLite/FwLiteDesktop/FwLiteDesktop.csproj b/backend/FwLite/FwLiteDesktop/FwLiteDesktop.csproj
@@ -22,10 +22,10 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
         <SelfContained>true</SelfContained>
-        <Platform Condition="$([MSBuild]::IsOSPlatform('windows'))">x64</Platform>
+<!--        <Platform Condition="$([MSBuild]::IsOSPlatform('windows'))">x64</Platform>-->
 
 		<!-- controls display name in Package.appxmanifest -->
-		<ApplicationTitle>FW Lite (nightly)</ApplicationTitle>
+		<ApplicationTitle>FieldWorks Lite</ApplicationTitle>
 
 		<!-- App Identifier -->
 		<ApplicationId>com.sil.fwlitedesktop</ApplicationId>

diff --git a/backend/FwLite/FwLiteDesktop/Platforms/Windows/Package.appxmanifest b/backend/FwLite/FwLiteDesktop/Platforms/Windows/Package.appxmanifest
@@ -5,18 +5,15 @@
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
   IgnorableNamespaces="uap rescap">
 
-  <Identity Name="FwLiteDesktop" Publisher="CN=&quot;SUMMER INSTITUTE OF LINGUISTICS, INC.&quot;, O=&quot;SUMMER INSTITUTE OF LINGUISTICS, INC.&quot;, S=Texas, C=US, OID.2.5.4.15=Private Organization, SERIALNUMBER=62218101" Version="0.0.0.0" />
-<!--    for now to publish to the microsoft store, we need to use a different identity-->
-   <!-- <Identity Name="KevinHahn.FWLitenightly"
-              Publisher="CN=7BEA9D9E-7070-4761-8F0A-2C10487C3E25"
-              Version="0.9.0.0"/>
--->
+  <Identity Name="FwLiteDesktop"
+            Publisher="CN=&quot;Summer Institute of Linguistics, Inc.&quot;, O=&quot;Summer Institute of Linguistics, Inc.&quot;, L=Dallas, S=Texas, C=US"
+            Version="0.0.0.0" />
   <Properties>
 <!--      publisher name must match the microsoft store-->
 <!--    <PublisherDisplayName>Kevin Hahn</PublisherDisplayName>-->
 <!--      modified with ApplicationTitle in FwLiteDesktop.csproj-->
     <DisplayName>$placeholder$</DisplayName>
-      <PublisherDisplayName>SIL</PublisherDisplayName>
+    <PublisherDisplayName>SIL</PublisherDisplayName>
     <Logo>$placeholder$.png</Logo>
   </Properties>