* Fix appx build issues

* Tried to make unplated task icons work... failed... wasted 10 hours... scaled resources don't work at all for Desktop apps it seems

.gitignore

@@ -11,3 +11,7 @@ website/data/
 
 *.sh
 *.cmd
+
+*.cer
+*.pfx
+*.pvk

build.xml

@@ -583,7 +583,7 @@
 	<target name="appx" description="Build Windows 10 package" depends="revision">
 		<copy tofile="${dir.dist}/appx/FileBot.jar" file="${path.fatjar}" />
 		<copy todir="${dir.dist}/appx">
-			<fileset dir="${dir.installer}/appx" includes="*.exe, *.ini, *.properties, *.png" />
+			<fileset dir="${dir.installer}/appx" excludes="*.xml, *.ini" />
 			<fileset dir="${dir.lib}/native/win32-x64" />
 		</copy>
 
@@ -606,7 +606,7 @@
 		</copy-replace>
 
 		<exec executable="makeappx" dir="${dir.dist}" failonerror="yes">
-			<arg line="pack /d appx /p ${release}_r${revision}.appx" />
+			<arg line="pack /v /o /d appx /p ${release}_r${revision}.appx" />
 		</exec>
 	</target>
 

installer/ant/ant.properties

@@ -19,6 +19,10 @@ package.description: FileBot is the ultimate tool for organizing and renaming yo
 package.tags: Mass Renamer, Rename TV shows, Rename movies, Organize media files, Fetch Subtitles, Check SFV files, Plex Media Server, Kodi Media Center, TheTVDB, TheMovieDB, OpenSubtitles
 package.homepage: http://www.filebot.net/
 
+# Distribution-specific Package Information
+microsoft.application.name: PointPlanck.FileBot
+microsoft.application.publisher: CN=761A0D2B-9B86-4FE4-B664-18E4E0AFC3F1
+
 # Platform-specific Package Information
 mac.application.category: public.app-category.utilities
 gnome.application.categories: AudioVideo;Video;Utility;FileTools

installer/appx/AppxManifest.xml

@@ -7,9 +7,9 @@
 	xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10">
 
 	<Identity
-		Name="PointPlanck.FileBot"
+		Name="@{microsoft.application.name}"
 		ProcessorArchitecture="x64"
-		Publisher="CN=761A0D2B-9B86-4FE4-B664-18E4E0AFC3F1"
+		Publisher="@{microsoft.application.publisher}"
 		Version="@{application.version}.0"
 	/>
 
@@ -17,11 +17,11 @@
 		<DisplayName>@{application.name}</DisplayName>
 		<PublisherDisplayName>@{package.company}</PublisherDisplayName>
 		<Description>@{package.description}</Description>
-		<Logo>icon.png</Logo>
+		<Logo>Assets\StoreLogo.png</Logo>
 	</Properties>
 
 	<Resources>
-		<Resource Language="en-us" />
+		<Resource Language="en-US" />
 	</Resources>
 
 	<Dependencies>
@@ -33,20 +33,17 @@
 	</Capabilities>
 
 	<Applications>
-		<Application Id="@{package.name}" Executable="filebot.launcher.exe" EntryPoint="Windows.FullTrustApplication">
-			<uap:VisualElements
-				DisplayName="@{application.name}"
-				Description="@{package.synopsis}"
-				BackgroundColor="transparent"
-				Square44x44Logo="icon44.png"
-				Square150x150Logo="icon150.png"
-			/>
+		<Application Id="@{package.identifier}" Executable="filebot.launcher.exe" EntryPoint="Windows.FullTrustApplication">
+			<uap:VisualElements DisplayName="@{application.name}" Description="@{package.synopsis}" BackgroundColor="transparent" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" >
+				<uap:DefaultTile ShortName="@{application.name}" Wide310x150Logo="Assets\Wide310x150Logo.png" Square310x310Logo="Assets\Square310x310Logo.png" Square71x71Logo="Assets\Square71x71Logo.png">
+					<uap:ShowNameOnTiles>
+						<uap:ShowOn Tile="square150x150Logo" />
+						<uap:ShowOn Tile="wide310x150Logo" />
+						<uap:ShowOn Tile="square310x310Logo" />
+					</uap:ShowNameOnTiles>
+				</uap:DefaultTile>
+			</uap:VisualElements>
 			<Extensions>
-				<uap3:Extension Category="windows.appExecutionAlias" Executable="filebot.exe" EntryPoint="Windows.FullTrustApplication">
-					<uap3:AppExecutionAlias>
-						<desktop:ExecutionAlias Alias="filebot.exe" />
-					</uap3:AppExecutionAlias>
-				</uap3:Extension>
 				<uap3:Extension Category="windows.appExecutionAlias" Executable="filebot.launcher.exe" EntryPoint="Windows.FullTrustApplication">
 					<uap3:AppExecutionAlias>
 						<desktop:ExecutionAlias Alias="filebot.launcher.exe" />
@@ -54,6 +51,24 @@
 				</uap3:Extension>
 			</Extensions>
 		</Application>
+		<Application Id="@{package.identifier}.Command" Executable="filebot.exe" EntryPoint="Windows.FullTrustApplication">
+			<uap:VisualElements DisplayName="@{application.name} (console)" Description="Run @{application.name} with Console" AppListEntry="none" BackgroundColor="black" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" >
+				<uap:DefaultTile ShortName="@{application.name} (console)" Wide310x150Logo="Assets\Wide310x150Logo.png" Square310x310Logo="Assets\Square310x310Logo.png" Square71x71Logo="Assets\Square71x71Logo.png">
+					<uap:ShowNameOnTiles>
+						<uap:ShowOn Tile="square150x150Logo" />
+						<uap:ShowOn Tile="wide310x150Logo" />
+						<uap:ShowOn Tile="square310x310Logo" />
+					</uap:ShowNameOnTiles>
+				</uap:DefaultTile>
+			</uap:VisualElements>
+			<Extensions>
+				<uap3:Extension Category="windows.appExecutionAlias" Executable="filebot.exe" EntryPoint="Windows.FullTrustApplication">
+					<uap3:AppExecutionAlias>
+						<desktop:ExecutionAlias Alias="filebot.exe" />
+					</uap3:AppExecutionAlias>
+				</uap3:Extension>
+			</Extensions>
+		</Application>
 	</Applications>
 
 </Package>

installer/appx/filebot.l4j.ini

@@ -32,4 +32,4 @@
 -Djava.util.logging.config.file="%EXEDIR%\logging.properties"
 
 # force Application User Model ID for Windows Store
--Dnet.filebot.AppUserModelID=PointPlanck.FileBot
+-Dnet.filebot.AppUserModelID=@{microsoft.application.name}

installer/appx/filebot.launcher.l4j.ini

@@ -32,4 +32,4 @@
 -Djava.util.logging.config.file="%EXEDIR%\logging.properties"
 
 # force Application User Model ID for Windows Store
--Dnet.filebot.AppUserModelID=PointPlanck.FileBot
+-Dnet.filebot.AppUserModelID=@{microsoft.application.name}