add some required code to be able to publish to the microsoft store f…

…or Kevin's personal account until we get a SIL org.
sillsdev · Jul 19, 2024 · a822096 · a822096
1 parent 6e7c5e6
commit a822096
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 25 deletions.
diff --git a/LexBox.sln b/LexBox.sln
@@ -106,10 +106,10 @@ Global
 		{9001FE0F-DBBF-4A78-9EB9-9B5042CF8A78}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9001FE0F-DBBF-4A78-9EB9-9B5042CF8A78}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9001FE0F-DBBF-4A78-9EB9-9B5042CF8A78}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{2CDF7126-733B-46E8-9B93-7DC31DE39682}.Debug|Any CPU.ActiveCfg = Debug-no-fw-bridge|Any CPU
-		{2CDF7126-733B-46E8-9B93-7DC31DE39682}.Debug|Any CPU.Build.0 = Debug-no-fw-bridge|Any CPU
-		{2CDF7126-733B-46E8-9B93-7DC31DE39682}.Release|Any CPU.ActiveCfg = Release-no-fw-bridge|Any CPU
-		{2CDF7126-733B-46E8-9B93-7DC31DE39682}.Release|Any CPU.Build.0 = Release-no-fw-bridge|Any CPU
+		{2CDF7126-733B-46E8-9B93-7DC31DE39682}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2CDF7126-733B-46E8-9B93-7DC31DE39682}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2CDF7126-733B-46E8-9B93-7DC31DE39682}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2CDF7126-733B-46E8-9B93-7DC31DE39682}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/backend/FwLite/FwDataMiniLcmBridge/FwDataMiniLcmBridge.csproj b/backend/FwLite/FwDataMiniLcmBridge/FwDataMiniLcmBridge.csproj
@@ -6,27 +6,25 @@
         <Nullable>enable</Nullable>
     </PropertyGroup>
     <ItemGroup>
-<!--        this is referenced by SIL.LCModel however it causes conflicts because CommonServiceLocator includes Microsoft.NETCore.App which includes it's own runtime, this is not compatible with MAUI-->
-        <PackageReference Include="CommonServiceLocator" Version="1.4.0" />
         <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
         <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
         <PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="72.1.0.3" />
         <PackageReference Include="SIL.LCModel" Version="11.0.0-beta0083"/>
-        <PackageReference Include="SIL.LCModel.Core" Version="11.0.0-beta0083"/>
-        <PackageReference Include="SIL.LCModel.Utils" Version="11.0.0-beta0083"/>
-        <PackageReference Include="structuremap.patched" Version="4.7.3"/>
+<!--        if you have a github personal access token, you can use this instead of the above, modify the nuget.config file to include your token-->
+<!--        <PackageReference Include="SIL.LCModel" Version="11.0.0-pr0302-0101" />-->
+        <PackageReference Include="structuremap.patched" Version="4.7.3" />
         <PackageReference Include="System.Linq.Async" Version="6.0.1" />
-        <PackageReference Include="System.Net.NameResolution" Version="4.3.0"/>
+        <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
         <PackageReference Include="System.Threading.ThreadPool" Version="4.3.0" />
     </ItemGroup>
 
     <ItemGroup>
-        <InternalsVisibleTo Include="FwDataMiniLcmBridge.Tests"/>
+        <InternalsVisibleTo Include="FwDataMiniLcmBridge.Tests" />
     </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\MiniLcm\MiniLcm.csproj"/>
+        <ProjectReference Include="..\MiniLcm\MiniLcm.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/backend/FwLite/FwLiteDesktop/FwLiteDesktop.csproj b/backend/FwLite/FwLiteDesktop/FwLiteDesktop.csproj
@@ -61,7 +61,7 @@
 	<ItemGroup>
 		<!-- App Icon -->
         <!--        background color is required for mac per: https://learn.microsoft.com/en-us/dotnet/maui/user-interface/images/app-icons?view=net-maui-8.0&tabs=windows#recolor-the-background -->
-        <MauiIcon Condition="$([MSBuild]::IsOSPlatform('osx'))" Include="Resources\AppIcon\logo_light.svg" Color="#1c4e80"/>
+        <MauiIcon Condition="$([MSBuild]::IsOSPlatform('osx'))" Include="Resources\AppIcon\logo_light.svg" Color="#1c4e80" />
 		<MauiIcon Include="Resources\AppIcon\logo_light.svg" />
 
 		<!-- Splash Screen -->
@@ -82,14 +82,15 @@
 		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
 		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
-        <PackageReference Include="NReco.Logging.File" Version="1.2.1"/>
+        <PackageReference Include="NReco.Logging.File" Version="1.2.1" />
+        <PackageReference Include="SIL.LCModel" Version="11.0.0-pr0302-0101" />
 	</ItemGroup>
 
 	<ItemGroup>
 	    <ProjectReference Include="..\LocalWebApp\LocalWebApp.csproj" />
 
-        <ProjectReference Include="..\LcmCrdt\LcmCrdt.csproj"/>
-        <ProjectReference Include="..\MiniLcm\MiniLcm.csproj"/>
+        <ProjectReference Include="..\LcmCrdt\LcmCrdt.csproj" />
+        <ProjectReference Include="..\MiniLcm\MiniLcm.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/backend/FwLite/FwLiteDesktop/Platforms/Windows/Package.appxmanifest b/backend/FwLite/FwLiteDesktop/Platforms/Windows/Package.appxmanifest
@@ -5,12 +5,19 @@
   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" />
-
+<!--  <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"/>
 
   <Properties>
-    <DisplayName>$placeholder$</DisplayName>
-    <PublisherDisplayName>SIL Global</PublisherDisplayName>
+<!--      again different names for now to publish to the microsoft store-->
+    <DisplayName>FW Lite (nightly)</DisplayName>
+    <PublisherDisplayName>Kevin Hahn</PublisherDisplayName>
+
+<!--      <DisplayName>$placeholder$</DisplayName>-->
+<!--      <PublisherDisplayName>SIL Global</PublisherDisplayName>-->
     <Logo>$placeholder$.png</Logo>
   </Properties>
 

diff --git a/backend/FwLite/LocalWebApp/LocalWebApp.csproj b/backend/FwLite/LocalWebApp/LocalWebApp.csproj
@@ -7,13 +7,10 @@
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
         <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
         <ServerGarbageCollection>false</ServerGarbageCollection>
-        <Configurations>Debug;Release;Debug-no-fw-bridge;Release-no-fw-bridge</Configurations>
-        <DefineConstants Condition="'$(Configuration)' == 'Debug-no-fw-bridge'">$(DefineConstants);DISABLE_FW_BRIDGE</DefineConstants>
-        <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>
+<!--        <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>

diff --git a/backend/FwLite/Taskfile.yml b/backend/FwLite/Taskfile.yml
@@ -26,7 +26,9 @@ tasks:
   publish-maui-desktop:
     label: Publish Maui Desktop
     dir: ./FwLiteDesktop
-    cmd: dotnet publish -f net8.0-windows10.0.19041.0 -r win-x64 --artifacts-path ../artifacts -p:Platform=x64
+    cmds:
+      - 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
 
   publish-local-all:
     cmds:

diff --git a/backend/FwLite/nuget.config b/backend/FwLite/nuget.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <packageSources>
+        <!-- requires github personal access token -->
+        <!-- <add key="github" value="https://nuget.pkg.github.com/sillsdev/index.json"/> -->
+    </packageSources>
+</configuration>