@positron-js/cli 1.0.6 → 1.0.12

package/README.md

@@ -1,3 +1,11 @@
-# CLI Interface for Positron-JS
+# Installation
 
-Please read https://github.com/Positron-JS/positron-web-view on how to use.
+## init
+```
+npx @positron-js/cli init
+```
+
+## build
+```
+npx @neurospeech/jex /node_modules/@positron-js/cli/content/build-android.jsx
+```

package/content/app/PositronApp/PositronApp.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0-ios;net8.0-android34.0;</TargetFrameworks>
+		<TargetFrameworks>net10.0-ios;net10.0-android;</TargetFrameworks>
 		<!--<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net7.0-windows10.0.19041</TargetFrameworks> -->
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
 		<!-- <TargetFrameworks>$(TargetFrameworks);net6.0-tizen</TargetFrameworks> -->
@@ -26,7 +26,7 @@
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">16.0</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">11</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">24</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">7.0</SupportedOSPlatformVersion>
 		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">7.0</TargetPlatformMinVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">8.0</SupportedOSPlatformVersion>
@@ -42,7 +42,7 @@
 		<RuntimeIdentifier>ios-arm64</RuntimeIdentifier>
 		<ArchiveOnBuild>true</ArchiveOnBuild>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(TargetFramework)'=='net8.0-ios'">
+	<PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
 	  	<UseInterpreter>true</UseInterpreter>  
 		<MTouchInterpreter>all</MTouchInterpreter>  
 		<MtouchLink>None</MtouchLink>
@@ -52,24 +52,39 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="NeuroSpeech.Positron" Version="1.2.14"/>
-		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.80"/>
-		<PackageReference Update="Microsoft.Maui.Controls.Compatibility" Version="8.0.80"/>
-		<PackageReference Include="Microsoft.Maui.Essentials" Version="8.0.80" />
-	  	<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2"/>
-	  	<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0"/>
+		<PackageReference Include="NeuroSpeech.Positron" Version="1.2.33" />
+		<PackageReference Include="Plugin.Maui.CalendarStore" Version="4.0.0" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.31" />
+		<PackageReference Update="Microsoft.Maui.Controls.Compatibility" Version="10.0.31" />
+		<PackageReference Include="Microsoft.Maui.Essentials" Version="10.0.31" />
+	  	<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.2" />
+	  	<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.2" />
 	</ItemGroup>
 
+	<ItemGroup Condition="$(TargetFramework.Contains('-ios'))">
+		<MauiIcon
+			Include="Resources\AppIcon\appicon.svg"
+			ForegroundFile="Resources\AppIcon\appicon.ios.svg"
+			Color="$(MAUI_ICON_IOS_COLOR)"
+			/>
+	</ItemGroup>
+	<ItemGroup Condition="$(TargetFramework.Contains('-android'))">
+		<MauiIcon
+			Include="Resources\AppIcon\appicon.svg"
+			ForegroundFile="Resources\AppIcon\appicon.droid.svg"
+			Color="$(MAUI_ICON_DROID_COLOR)" />
+	</ItemGroup>
+	
 	<ItemGroup>
-		<!-- App Icon -->
-		<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
-
+		
 		<!-- Splash Screen -->
-		<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
+		<MauiSplashScreen
+			Include="Resources\Splash\splash.svg"
+			Color="$(MAUI_SPLASH_SCREEN_COLOR)"
+			BaseSize="$(MAUI_SPLASH_BASE_SIZE)" />
 
 		<!-- Images -->
-		<MauiImage Include="Resources\Images\*" />
-		<MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />
+		<MauiImage Include="Resources\Images\*" />		
 
 		<!-- Custom Fonts -->
 		<MauiFont Include="Resources\Fonts\*" />
@@ -81,12 +96,13 @@
 	<ItemGroup Condition="$(TargetFramework.Contains('-android'))">
 	
 		<!-- <PackageReference Include="Xamarin.GooglePlayServices.Location" Version="121.0.1.4" /> -->
-		<PackageReference Include="Xamarin.AndroidX.Collection" Version="1.4.2" />
-		<PackageReference Include="Xamarin.AndroidX.Collection.Ktx" Version="1.4.2" />
-
-		<PackageReference Include="Xamarin.AndroidX.Activity" Version="1.9.1" />
-		<PackageReference Include="Xamarin.AndroidX.Activity.Ktx" Version="1.9.1" />
-		<PackageReference Include="Xamarin.AndroidX.Fragment.Ktx" Version="1.8.2" />
+		<PackageReference Include="Xamarin.AndroidX.Collection" Version="1.5.0.4" />
+		<PackageReference Include="Xamarin.AndroidX.Collection.Ktx" Version="1.5.0.4" />
+		<PackageReference Include="Xamarin.AndroidX.SavedState" Version="1.4.0.1" />
+		<PackageReference Include="Xamarin.AndroidX.SavedState.SavedState.Android" Version="1.4.0.1" />
+		<PackageReference Include="Xamarin.AndroidX.Activity" Version="1.12.2.1" />
+		<PackageReference Include="Xamarin.AndroidX.Activity.Ktx" Version="1.12.2.1" />
+		<PackageReference Include="Xamarin.AndroidX.Fragment.Ktx" Version="1.8.9.1" />
 			
 		<!-- <GoogleServicesJson Include="config\google-services.json" /> -->
 	</ItemGroup>

package/content/build-android.js

@@ -0,0 +1,53 @@
+import XNode from "@neurospeech/jex/dist/core/XNode.js";
+import { invoke, Batch, Run, mask } from "@neurospeech/jex/index.js";
+import { FileSystem } from "@neurospeech/jex/dist/utils/FileSystem.js";
+import { PlayStore } from "@neurospeech/jex/dist/ci/android/PlayStore.js";
+import { Build } from "@neurospeech/jex/dist/ci/build/Build.js";
+import assert from "assert";
+import { Common } from "./common.js";
+import configs from "../build-android.config.js";
+let applicationDisplayVersion;
+let applicationVersion;
+for (const config of configs) {
+  if (!config) {
+    continue;
+  }
+  await invoke(XNode.create(Batch, null, () => "\n\n        ", () => "\n\n        ", () => XNode.create(Build.PrepareVersion, {
+    mode: config.buildNumber,
+    then: x => (applicationDisplayVersion = `${x.major}.${x.minor}`, applicationVersion = x.build),
+    location: "D:\\git\\github\\positron\\cli\\content\\build-android.jsx 27,8"
+  }), () => "\n\n        ", () => XNode.create(Common.PreBuild, {
+    positronAppDir: positronAppDir,
+    location: "D:\\git\\github\\positron\\cli\\content\\build-android.jsx 32,8"
+  }), () => "\n\n        ", () => XNode.create(FileSystem.MergeJson, {
+    json: {
+      App: {
+        Url: config.url
+      }
+    },
+    path: "./maui/PositronApp/appsettings.json",
+    location: "D:\\git\\github\\positron\\cli\\content\\build-android.jsx 34,8"
+  }), () => "\n\n        ", () => (assert(applicationDisplayVersion), null), () => "\n        ", () => (assert(applicationVersion), null), () => "\n\n        ", () => XNode.create(Run, {
+    cmd: "dotnet",
+    timeout: 300000,
+    args: "workload install maui",
+    location: "D:\\git\\github\\positron\\cli\\content\\build-android.jsx 46,8"
+  }), () => "\n\n        ", () => XNode.create(Run, {
+    cmd: "dotnet",
+    timeout: 300000,
+    args: "workload install android",
+    location: "D:\\git\\github\\positron\\cli\\content\\build-android.jsx 52,8"
+  }), () => "\n\n        \n        ", () => XNode.create(Run, {
+    cmd: "dotnet",
+    timeout: 240000,
+    logData: true,
+    args: ["publish", "-f", config.targetFramework, "-c", "Release", `/p:ApplicationId=${config.id}`, `/p:ApplicationTitle=${config.name}`, `/p:ApplicationVersion=${applicationVersion}`, `/p:ApplicationDisplayVersion=${applicationDisplayVersion}`, "/p:AndroidKeyStore=true", `/p:AndroidSigningKeyAlias=${config.androidSigningKeyAlias}`, `/p:AndroidSigningKeyStore=${config.androidKeyStore}`, mask`/p:AndroidSigningStorePass=${config.androidKeyStorePassword}`, mask`/p:AndroidSigningKeyPass=${config.androidKeyStorePassword}`, config.androidSdkRoot ? `/p:AndroidSdkPath=${config.androidSdkRoot}` : void 0, config.javaHome ? `/p:JavaSdkDirectory=${config.javaHome}` : void 0, "./maui/PositronApp/PositronApp.csproj"],
+    location: "D:\\git\\github\\positron\\cli\\content\\build-android.jsx 59,8"
+  }), () => "\n\n        ", () => XNode.create(PlayStore.Upload, {
+    packageName: config.id,
+    releaseFiles: [`./maui/PositronApp/bin/Release/${config.targetFramework}/publish/*-Signed.apk`],
+    serviceAccountJsonRaw: config.serviceAccountJsonRaw,
+    serviceAccountJson: config.serviceAccountJson,
+    location: "D:\\git\\github\\positron\\cli\\content\\build-android.jsx 80,8"
+  }), () => "\n\n    "));
+}

package/content/build-android.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["XNode","invoke","Batch","Run","mask","FileSystem","PlayStore","Build","assert","Common","configs","applicationDisplayVersion","applicationVersion","config","create","PrepareVersion","mode","buildNumber","then","x","major","minor","build","location","PreBuild","positronAppDir","MergeJson","json","App","Url","url","path","cmd","timeout","args","logData","targetFramework","id","name","androidSigningKeyAlias","androidKeyStore","androidKeyStorePassword","androidSdkRoot","javaHome","Upload","packageName","releaseFiles","serviceAccountJsonRaw","serviceAccountJson"],"sources":["build-android.jsx"],"sourcesContent":["import XNode from \"@neurospeech/jex/dist/core/XNode.js\";import { invoke, Batch, Run, mask } from \"@neurospeech/jex/index.js\";\r\nimport { FileSystem } from \"@neurospeech/jex/dist/utils/FileSystem.js\";\r\nimport { PlayStore } from \"@neurospeech/jex/dist/ci/android/PlayStore.js\";\r\nimport { Build } from \"@neurospeech/jex/dist/ci/build/Build.js\";\r\nimport assert from \"assert\";\r\nimport { Common } from \"./common.jsx\";\r\n\r\nimport configs from \"../build-android.config.js\";\r\n\r\nlet applicationDisplayVersion;\r\nlet applicationVersion;\r\n\r\nfor(const config of configs) {\r\n\r\n    if (!config) {\r\n        continue;\r\n    }\r\n\r\n    await invoke(<Batch>\r\n\r\n        {/* <Run\r\n            cmd=\"dotnet\"\r\n            throwOnFail={false}\r\n            args=\"nuget locals all --clear\"\r\n            /> */}\r\n\r\n        <Build.PrepareVersion\r\n            mode={config.buildNumber}\r\n            then={(x) => (applicationDisplayVersion = `${x.major}.${x.minor}`, applicationVersion = x.build)}\r\n            />\r\n\r\n        <Common.PreBuild positronAppDir={positronAppDir} />\r\n\r\n        <FileSystem.MergeJson\r\n            json={({\r\n                App: {\r\n                    Url: config.url\r\n                }\r\n            })}\r\n            path=\"./maui/PositronApp/appsettings.json\"\r\n            />\r\n\r\n        { assert(applicationDisplayVersion) }\r\n        { assert(applicationVersion) }\r\n\r\n        <Run\r\n            cmd=\"dotnet\"\r\n            timeout={300000}\r\n            args=\"workload install maui\"\r\n            />\r\n\r\n        <Run\r\n            cmd=\"dotnet\"\r\n            timeout={300000}\r\n            args=\"workload install android\"\r\n            />\r\n\r\n        \r\n        <Run\r\n            cmd=\"dotnet\"\r\n            timeout={240000}\r\n            logData={true}\r\n            args={[\"publish\",\r\n                \"-f\", config.targetFramework,\r\n                \"-c\", \"Release\",\r\n                `/p:ApplicationId=${config.id}`,\r\n                `/p:ApplicationTitle=${config.name}`,\r\n                `/p:ApplicationVersion=${applicationVersion}`,\r\n                `/p:ApplicationDisplayVersion=${applicationDisplayVersion}`,\r\n                \"/p:AndroidKeyStore=true\",\r\n                `/p:AndroidSigningKeyAlias=${config.androidSigningKeyAlias}`,\r\n                `/p:AndroidSigningKeyStore=${config.androidKeyStore}`,\r\n                mask `/p:AndroidSigningStorePass=${config.androidKeyStorePassword}`,\r\n                mask `/p:AndroidSigningKeyPass=${config.androidKeyStorePassword}`,\r\n                config.androidSdkRoot ? `/p:AndroidSdkPath=${config.androidSdkRoot}` : void 0,\r\n                config.javaHome ? `/p:JavaSdkDirectory=${config.javaHome}`: void 0,\r\n                \"./maui/PositronApp/PositronApp.csproj\"]}\r\n            />\r\n\r\n        <PlayStore.Upload\r\n            packageName={config.id}\r\n            releaseFiles={[`./maui/PositronApp/bin/Release/${config.targetFramework}/publish/*-Signed.apk`]}\r\n            serviceAccountJsonRaw={config.serviceAccountJsonRaw}\r\n            serviceAccountJson={config.serviceAccountJson}\r\n            />\r\n\r\n    </Batch>);\r\n}"],"mappings":"AAAA,OAAOA,KAAK,MAAM,qCAAqC;AAAC,SAASC,MAAM,EAAEC,KAAK,EAAEC,GAAG,EAAEC,IAAI,QAAQ,2BAA2B;AAC5H,SAASC,UAAU,QAAQ,2CAA2C;AACtE,SAASC,SAAS,QAAQ,+CAA+C;AACzE,SAASC,KAAK,QAAQ,yCAAyC;AAC/D,OAAOC,MAAM,MAAM,QAAQ;AAC3B,SAASC,MAAM,QAAQ,aAAc;AAErC,OAAOC,OAAO,MAAM,4BAA4B;AAEhD,IAAIC,yBAAyB;AAC7B,IAAIC,kBAAkB;AAEtB,KAAI,MAAMC,MAAM,IAAIH,OAAO,EAAE;EAEzB,IAAI,CAACG,MAAM,EAAE;IACT;EACJ;EAEA,MAAMZ,MAAM,CAACD,KAAA,CAAAc,MAAA,CAACZ,KAAK,0DAQfF,KAAA,CAAAc,MAAA,CAACP,KAAK,CAACQ,cAAc;IACjBC,IAAI,EAAEH,MAAM,CAACI,WAAY;IACzBC,IAAI,EAAGC,CAAC,KAAMR,yBAAyB,GAAG,GAAGQ,CAAC,CAACC,KAAK,IAAID,CAAC,CAACE,KAAK,EAAE,EAAET,kBAAkB,GAAGO,CAAC,CAACG,KAAK,CAAE;IAAAC,QAAA;EAAA,CAChG,CAAC,8BAENvB,KAAA,CAAAc,MAAA,CAACL,MAAM,CAACe,QAAQ;IAACC,cAAc,EAAEA,cAAe;IAAAF,QAAA;EAAA,CAAE,CAAC,8BAEnDvB,KAAA,CAAAc,MAAA,CAACT,UAAU,CAACqB,SAAS;IACjBC,IAAI,EAAG;MACHC,GAAG,EAAE;QACDC,GAAG,EAAEhB,MAAM,CAACiB;MAChB;IACJ,CAAG;IACHC,IAAI,EAAC,qCAAqC;IAAAR,QAAA;EAAA,CACzC,CAAC,+BAEJf,MAAM,CAACG,yBAAyB,CAAC,oCACjCH,MAAM,CAACI,kBAAkB,CAAC,qCAE5BZ,KAAA,CAAAc,MAAA,CAACX,GAAG;IACA6B,GAAG,EAAC,QAAQ;IACZC,OAAO,EAAE,MAAO;IAChBC,IAAI,EAAC,uBAAuB;IAAAX,QAAA;EAAA,CAC3B,CAAC,8BAENvB,KAAA,CAAAc,MAAA,CAACX,GAAG;IACA6B,GAAG,EAAC,QAAQ;IACZC,OAAO,EAAE,MAAO;IAChBC,IAAI,EAAC,0BAA0B;IAAAX,QAAA;EAAA,CAC9B,CAAC,wCAGNvB,KAAA,CAAAc,MAAA,CAACX,GAAG;IACA6B,GAAG,EAAC,QAAQ;IACZC,OAAO,EAAE,MAAO;IAChBE,OAAO,EAAE,IAAK;IACdD,IAAI,EAAE,CAAC,SAAS,EACZ,IAAI,EAAErB,MAAM,CAACuB,eAAe,EAC5B,IAAI,EAAE,SAAS,EACf,oBAAoBvB,MAAM,CAACwB,EAAE,EAAE,EAC/B,uBAAuBxB,MAAM,CAACyB,IAAI,EAAE,EACpC,yBAAyB1B,kBAAkB,EAAE,EAC7C,gCAAgCD,yBAAyB,EAAE,EAC3D,yBAAyB,EACzB,6BAA6BE,MAAM,CAAC0B,sBAAsB,EAAE,EAC5D,6BAA6B1B,MAAM,CAAC2B,eAAe,EAAE,EACrDpC,IAAK,8BAA8BS,MAAM,CAAC4B,uBAAuB,EAAE,EACnErC,IAAK,4BAA4BS,MAAM,CAAC4B,uBAAuB,EAAE,EACjE5B,MAAM,CAAC6B,cAAc,GAAG,qBAAqB7B,MAAM,CAAC6B,cAAc,EAAE,GAAG,KAAK,CAAC,EAC7E7B,MAAM,CAAC8B,QAAQ,GAAG,uBAAuB9B,MAAM,CAAC8B,QAAQ,EAAE,GAAE,KAAK,CAAC,EAClE,uCAAuC,CAAE;IAAApB,QAAA;EAAA,CAC5C,CAAC,8BAENvB,KAAA,CAAAc,MAAA,CAACR,SAAS,CAACsC,MAAM;IACbC,WAAW,EAAEhC,MAAM,CAACwB,EAAG;IACvBS,YAAY,EAAE,CAAC,kCAAkCjC,MAAM,CAACuB,eAAe,uBAAuB,CAAE;IAChGW,qBAAqB,EAAElC,MAAM,CAACkC,qBAAsB;IACpDC,kBAAkB,EAAEnC,MAAM,CAACmC,kBAAmB;IAAAzB,QAAA;EAAA,CAC7C,CAAC,kBAEH,CAAC,CAAC;AACb","ignoreList":[]}

package/{build-android.jsx → content/build-android.jsx}

@@ -1,86 +1,91 @@
-import { invoke, Batch, Run, mask } from "@neurospeech/jex/index.js";
-import { FileSystem } from "@neurospeech/jex/dist/utils/FileSystem.js";
-import { PlayStore } from "@neurospeech/jex/dist/ci/android/PlayStore.js";
-import { Build } from "@neurospeech/jex/dist/ci/build/Build.js";
-import assert from "assert";
-
-
-import configs from "./build-android.config.js";
-
-let applicationDisplayVersion;
-let applicationVersion;
-
-for(const config of configs) {
-
-    if (!config) {
-        continue;
-    }
-
-    await invoke(<Batch>
-
-        {/* <Run
-            cmd="dotnet"
-            throwOnFail={false}
-            args="nuget locals all --clear"
-            /> */}
-
-        <Build.PrepareVersion
-            mode={config.buildNumber}
-            then={(x) => (applicationDisplayVersion = `${x.major}.${x.minor}`, applicationVersion = x.build)}
-            />
-
-        <FileSystem.MergeJson
-            json={({
-                App: {
-                    Url: config.url
-                }
-            })}
-            path="./maui/PositronApp/appsettings.json"
-            />
-
-        { assert(applicationDisplayVersion) }
-        { assert(applicationVersion) }
-
-        <Run
-            cmd="dotnet"
-            timeout={300000}
-            args="workload install maui"
-            />
-
-        <Run
-            cmd="dotnet"
-            timeout={300000}
-            args="workload install android"
-            />
-
-        
-        <Run
-            cmd="dotnet"
-            timeout={240000}
-            logData={true}
-            args={["publish",
-                "-f", config.targetFramework,
-                "-c", "Release",
-                `/p:ApplicationId=${config.id}`,
-                `/p:ApplicationTitle=${config.name}`,
-                `/p:ApplicationVersion=${applicationVersion}`,
-                `/p:ApplicationDisplayVersion=${applicationDisplayVersion}`,
-                "/p:AndroidKeyStore=true",
-                `/p:AndroidSigningKeyAlias=${config.androidSigningKeyAlias}`,
-                `/p:AndroidSigningKeyStore=${config.androidKeyStore}`,
-                mask `/p:AndroidSigningStorePass=${config.androidKeyStorePassword}`,
-                mask `/p:AndroidSigningKeyPass=${config.androidKeyStorePassword}`,
-                config.androidSdkRoot ? `/p:AndroidSdkPath=${config.androidSdkRoot}` : void 0,
-                config.javaHome ? `/p:JavaSdkDirectory=${config.javaHome}`: void 0,
-                "./maui/PositronApp/PositronApp.csproj"]}
-            />
-
-        <PlayStore.Upload
-            packageName={config.id}
-            releaseFiles={[`./maui/PositronApp/bin/Release/${config.targetFramework}/publish/*-Signed.apk`]}
-            serviceAccountJsonRaw={config.serviceAccountJsonRaw}
-            serviceAccountJson={config.serviceAccountJson}
-            />
-
-    </Batch>);
+import { invoke, Batch, Run, mask } from "@neurospeech/jex/index.js";
+import { FileSystem } from "@neurospeech/jex/dist/utils/FileSystem.js";
+import { PlayStore } from "@neurospeech/jex/dist/ci/android/PlayStore.js";
+import { Build } from "@neurospeech/jex/dist/ci/build/Build.js";
+import assert from "assert";
+import { Common } from "./common.jsx";
+import { pathToFileURL } from "url";
+import { resolve } from "path";
+
+
+let applicationDisplayVersion;
+let applicationVersion;
+
+const { default: configs } = await import( pathToFileURL( resolve("./build-android.config.js")));
+
+for(const config of configs) {
+
+    if (!config) {
+        continue;
+    }
+
+    await invoke(<Batch>
+
+        {/* <Run
+            cmd="dotnet"
+            throwOnFail={false}
+            args="nuget locals all --clear"
+            /> */}
+
+        <Build.PrepareVersion
+            mode={config.buildNumber}
+            then={(x) => (applicationDisplayVersion = `${x.major}.${x.minor}`, applicationVersion = x.build)}
+            />
+
+        <Common.PreBuild />
+
+        <FileSystem.MergeJson
+            json={({
+                App: {
+                    Url: config.url
+                }
+            })}
+            path="./maui/PositronApp/appsettings.json"
+            />
+
+        { assert(applicationDisplayVersion) }
+        { assert(applicationVersion) }
+
+        <Run
+            cmd="dotnet"
+            timeout={300000}
+            args="workload install maui"
+            />
+
+        <Run
+            cmd="dotnet"
+            timeout={300000}
+            args="workload install android"
+            />
+
+        
+        <Run
+            cmd="dotnet"
+            timeout={240000}
+            logData={true}
+            args={["publish",
+                "-f", config.targetFramework,
+                "-c", "Release",
+                `/p:ApplicationId=${config.id}`,
+                `/p:ApplicationTitle=${config.name}`,
+                `/p:ApplicationVersion=${applicationVersion}`,
+                `/p:ApplicationDisplayVersion=${applicationDisplayVersion}`,
+                "/p:AndroidKeyStore=true",
+                `/p:AndroidSigningKeyAlias=${config.androidSigningKeyAlias}`,
+                `/p:AndroidSigningKeyStore=${config.androidKeyStore}`,
+                mask `/p:AndroidSigningStorePass=${config.androidKeyStorePassword}`,
+                mask `/p:AndroidSigningKeyPass=${config.androidKeyStorePassword}`,
+                config.androidSdkRoot ? `/p:AndroidSdkPath=${config.androidSdkRoot}` : void 0,
+                config.javaHome ? `/p:JavaSdkDirectory=${config.javaHome}`: void 0,
+                "./maui/PositronApp/PositronApp.csproj"]}
+            />
+
+        <PlayStore.Upload
+            packageName={config.id}
+            releaseFiles={[`./maui/PositronApp/bin/Release/${config.targetFramework}/publish/*-Signed.apk`]}
+            serviceAccountJsonRaw={config.serviceAccountJsonRaw}
+            serviceAccountJson={config.serviceAccountJson}
+            />
+
+    </Batch>);
 }

package/{build-ios.jsx → content/build-ios.jsx}

@@ -1,108 +1,111 @@
-import { invoke, Batch, Run} from "@neurospeech/jex/index.js";
-import { FileSystem } from "@neurospeech/jex/dist/utils/FileSystem.js";
-import { AppleDev } from "@neurospeech/jex/dist/ci/mac/AppleDev.js";
-import { Build } from "@neurospeech/jex/dist/ci/build/Build.js";
-import { XCRun } from "@neurospeech/jex/dist/ci/mac/XCRun.js";
-import assert from "assert";
-import configs from "./build-ios.config.js";
-
-let applicationDisplayVersion;
-let applicationVersion;
-
-const keyChainPath= "./kc1.db";
-
-let signingIdentity;
-let provisioningProfile;
-
-for (const config of configs) {
-
-    if (!config) {
-        continue;
-    }
-
-    await invoke(<Batch
-        cleanup={<Batch>
-            <AppleDev.Clear
-                keyChainPath={keyChainPath}
-                provisioningProfile={config.provisioningProfileFile}
-                />
-        </Batch>}
-        >
-
-
-        <FileSystem.MergeJson
-            json={({
-                App: {
-                    Url: config.url
-                }
-            })}
-            path="./maui/PositronApp/appsettings.json"
-            />
-            
-        <Build.PrepareVersion
-            mode={config.buildNumber}
-            then={(x) => (applicationDisplayVersion = `${x.major}.${x.minor}`, applicationVersion = x.build)}
-            />
-
-        { assert(applicationDisplayVersion) }
-        { assert(applicationVersion) }
-
-        <AppleDev.InstallCert
-            certPath={config.certPath}
-            certPass={config.certPass}
-            keyChainPath={keyChainPath}
-            keyChainPass=""
-            provisioningProfile={config.provisioningProfileFile}
-            then={(r) => (signingIdentity = r.friendlyName, provisioningProfile = r.pp.name)}
-            />
-
-        { console.log(`Using identity ${signingIdentity}`)}
-        { console.log(`Using profile ${provisioningProfile}`)}
-
-        {/* <Run
-            cmd="dotnet"
-            args="nuget locals all --clear"
-            /> */}
-
-        <Run
-            cmd="dotnet"
-            timeout={300000}
-            args="workload install maui"
-            />
-
-        <Run
-            cmd="dotnet"
-            timeout={300000}
-            args="workload install android ios"
-            />
-
-        
-        <Run
-            cmd="dotnet"
-            timeout={600000}
-            logData={true}
-            args={["publish",
-                "-f", "net8.0-ios",
-                "-c", "Release",            
-                "/p:BuildIpa=true",
-                "/p:RuntimeIdentifier=ios-arm64",
-                `/p:ApplicationId=${config.id}`,
-                `/p:ApplicationVersion=${applicationVersion}`,
-                `/p:ApplicationDisplayVersion=${applicationDisplayVersion}`,
-                `/p:CodesignKey=${signingIdentity}`,
-                `/p:CodesignProvision=${provisioningProfile}`,
-                "./maui/PositronApp/PositronApp.csproj"]}
-            />
-        
-
-        <XCRun.UploadApp
-            timeout={600000}
-            appPath="./maui/PositronApp/bin/Release/net8.0-ios/ios-arm64/publish/PositronApp.ipa"
-            appType="ios"
-            apiKeyId={config.appStoreConnect.apiKeyId}
-            issuerId={config.appStoreConnect.issuerId}
-            apiPrivateKey={config.appStoreConnect.privateKey}
-            />
-
-    </Batch>);
+import { invoke, Batch, Run} from "@neurospeech/jex/index.js";
+import { FileSystem } from "@neurospeech/jex/dist/utils/FileSystem.js";
+import { AppleDev } from "@neurospeech/jex/dist/ci/mac/AppleDev.js";
+import { Build } from "@neurospeech/jex/dist/ci/build/Build.js";
+import { XCRun } from "@neurospeech/jex/dist/ci/mac/XCRun.js";
+import assert from "assert";
+import { Common } from "./common.jsx";
+
+const { default: configs } = await import("../build-ios.config.js");
+
+let applicationDisplayVersion;
+let applicationVersion;
+
+const keyChainPath= "./kc1.db";
+
+let signingIdentity;
+let provisioningProfile;
+
+for (const config of configs) {
+
+    if (!config) {
+        continue;
+    }
+
+    await invoke(<Batch
+        cleanup={<Batch>
+            <AppleDev.Clear
+                keyChainPath={keyChainPath}
+                provisioningProfile={config.provisioningProfileFile}
+                />
+        </Batch>}
+        >
+
+        <Common.PreBuild/>
+
+        <FileSystem.MergeJson
+            json={({
+                App: {
+                    Url: config.url
+                }
+            })}
+            path="./maui/PositronApp/appsettings.json"
+            />
+            
+        <Build.PrepareVersion
+            mode={config.buildNumber}
+            then={(x) => (applicationDisplayVersion = `${x.major}.${x.minor}`, applicationVersion = x.build)}
+            />
+
+        { assert(applicationDisplayVersion) }
+        { assert(applicationVersion) }
+
+        <AppleDev.InstallCert
+            certPath={config.certPath}
+            certPass={config.certPass}
+            keyChainPath={keyChainPath}
+            keyChainPass=""
+            provisioningProfile={config.provisioningProfileFile}
+            then={(r) => (signingIdentity = r.friendlyName, provisioningProfile = r.pp.name)}
+            />
+
+        { console.log(`Using identity ${signingIdentity}`)}
+        { console.log(`Using profile ${provisioningProfile}`)}
+
+        {/* <Run
+            cmd="dotnet"
+            args="nuget locals all --clear"
+            /> */}
+
+        <Run
+            cmd="dotnet"
+            timeout={300000}
+            args="workload install maui"
+            />
+
+        <Run
+            cmd="dotnet"
+            timeout={300000}
+            args="workload install android ios"
+            />
+
+        
+        <Run
+            cmd="dotnet"
+            timeout={600000}
+            logData={true}
+            args={["publish",
+                "-f", "net10.0-ios",
+                "-c", "Release",            
+                "/p:BuildIpa=true",
+                "/p:RuntimeIdentifier=ios-arm64",
+                `/p:ApplicationId=${config.id}`,
+                `/p:ApplicationVersion=${applicationVersion}`,
+                `/p:ApplicationDisplayVersion=${applicationDisplayVersion}`,
+                `/p:CodesignKey=${signingIdentity}`,
+                `/p:CodesignProvision=${provisioningProfile}`,
+                "./maui/PositronApp/PositronApp.csproj"]}
+            />
+        
+
+        <XCRun.UploadApp
+            timeout={600000}
+            appPath="./maui/PositronApp/bin/Release/net10.0-ios/ios-arm64/publish/PositronApp.ipa"
+            appType="ios"
+            apiKeyId={config.appStoreConnect.apiKeyId}
+            issuerId={config.appStoreConnect.issuerId}
+            apiPrivateKey={config.appStoreConnect.privateKey}
+            />
+
+    </Batch>);
 }