sort out publishing workflow to produce an msix installer

sillsdev · Jul 17, 2024 · bf15b4c · bf15b4c
1 parent 7693869
commit bf15b4c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/.github/workflows/fw-lite.yaml b/.github/workflows/fw-lite.yaml
@@ -68,10 +68,17 @@ jobs:
       - name: Publish win-arm
         working-directory: backend/FwLite/LocalWebApp
         run: dotnet publish -r win-arm64 --artifacts-path ../artifacts
+      - name: Publish win maui app
+        working-directory: backend/FwLite/FwLiteDesktop
+        run: |
+          dotnet publish -f net8.0-windows10.0.19041.0 -r win-x64 --artifacts-path ../artifacts -p:Platform=x64
+          dotnet publish -f net8.0-windows10.0.19041.0 -r win-arm64 --artifacts-path ../artifacts -p:Platform=arm64
       - name: Upload artifacts
         # uploading in one artifact as there's a lot of duplication between builds so compression goes far
         uses: actions/upload-artifact@v4
         with:
           name: fw-lite
           if-no-files-found: error
-          path: backend/FwLite/artifacts/publish/LocalWebApp/*
+          path: |
+            backend/FwLite/artifacts/publish/LocalWebApp/*
+            backend/FwLite/artifacts/bin/FwLiteDesktop/*/AppPackages/FwLiteDesktop_1.0.0.1_Test/*.msix
diff --git a/backend/FwLite/FwLiteDesktop/FwLiteDesktop.csproj b/backend/FwLite/FwLiteDesktop/FwLiteDesktop.csproj
@@ -44,7 +44,7 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)' == 'Release' ">
         <PublishSingleFile>false</PublishSingleFile>
-        <SelfContained>false</SelfContained>
+        <SelfContained>true</SelfContained>
         <PublishTrimmed>false</PublishTrimmed>
     </PropertyGroup>
     <PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows' and '$(Configuration)' == 'Release'">

diff --git a/backend/FwLite/FwLiteDesktop/Platforms/Windows/Package.appxmanifest b/backend/FwLite/FwLiteDesktop/Platforms/Windows/Package.appxmanifest
@@ -2,17 +2,15 @@
 <Package
   xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
   IgnorableNamespaces="uap rescap">
 
-  <Identity Name="maui-package-name-placeholder" Publisher="CN=User Name" Version="0.0.0.0" />
+  <Identity Name="FwLiteDesktop" Publisher="CN=SIL, OID.2.25.311729368913984317654407730594956997722=1" Version="0.0.0.0" />
 
-  <mp:PhoneIdentity PhoneProductId="1DC5C0B2-C5F2-461C-8F89-237BF4D0CEF0" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
   <Properties>
     <DisplayName>$placeholder$</DisplayName>
-    <PublisherDisplayName>User Name</PublisherDisplayName>
+    <PublisherDisplayName>SIL Global</PublisherDisplayName>
     <Logo>$placeholder$.png</Logo>
   </Properties>
 

diff --git a/backend/FwLite/LocalWebApp/LocalAppKernel.cs b/backend/FwLite/LocalWebApp/LocalAppKernel.cs
@@ -1,7 +1,7 @@
 using System.Text.Json;
 using Crdt;
 #if !DISABLE_FW_BRIDGE
-using FwDataMiniLcmBridge
+using FwDataMiniLcmBridge;
 #endif
 using LcmCrdt;
 using LocalWebApp.Services;

diff --git a/backend/FwLite/LocalWebApp/LocalWebApp.csproj b/backend/FwLite/LocalWebApp/LocalWebApp.csproj
@@ -12,6 +12,8 @@
         <DefineConstants Condition="'$(Configuration)' == 'Release-no-fw-bridge'">$(DefineConstants);DISABLE_FW_BRIDGE</DefineConstants>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)' == 'Release' ">
+<!--        disabled due to https://github.com/sillsdev/languageforge-lexbox/issues/964 -->
+        <DefineConstants>$(DefineConstants);DISABLE_FW_BRIDGE</DefineConstants>
 <!--        single file disabled for now, pending https://github.com/sillsdev/icu-dotnet/pull/201-->
         <PublishSingleFile>false</PublishSingleFile>
         <SelfContained>true</SelfContained>