Increase version, hopefully fixed some packaging issues

felixse · Oct 12, 2019 · b08fb11 · b08fb11
1 parent f5c91c1
commit b08fb11
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 10 deletions.
diff --git a/FluentTerminal.App/FluentTerminal.App.csproj b/FluentTerminal.App/FluentTerminal.App.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FluentTerminal.App</RootNamespace>
     <AssemblyName>FluentTerminal.App</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
+    <DefaultLanguage>en</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
@@ -241,6 +241,9 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Properties\Default.rd.xml" />
+    <PRIResource Include="Strings\it\Resources.resw" />
+    <PRIResource Include="Strings\nl\Resources.resw" />
+    <PRIResource Include="Strings\pl\Resources.resw" />
   </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="App.xaml">

diff --git a/FluentTerminal.Package/FluentTerminal.Package.wapproj b/FluentTerminal.Package/FluentTerminal.Package.wapproj
@@ -60,44 +60,54 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
     <PackageCertificateKeyFile>FluentTerminal.App_StoreKey.pfx</PackageCertificateKeyFile>
-    <EntryPointProjectUniqueName>..\FluentTerminal.App\FluentTerminal.App.csproj</EntryPointProjectUniqueName>
+    <EntryPointProjectUniqueName>$(SolutionDir)FluentTerminal.App\FluentTerminal.App.csproj</EntryPointProjectUniqueName>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
-    <GenerateTestArtifacts>True</GenerateTestArtifacts>
+    <GenerateTestArtifacts>False</GenerateTestArtifacts>
     <AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
     <PackageCertificateThumbprint>8A5DE5B20B663BD6A99B44C5BA278289521F419F</PackageCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <AppxBundle>Always</AppxBundle>
+    <DefaultLanguage>en</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
     <AppxBundle>Always</AppxBundle>
+    <DefaultLanguage>en</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <AppxBundle>Always</AppxBundle>
+    <DefaultLanguage>en</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <AppxBundle>Always</AppxBundle>
+    <DefaultLanguage>en</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <AppxBundle>Always</AppxBundle>
+    <DefaultLanguage>en</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
     <AppxBundle>Always</AppxBundle>
+    <DefaultLanguage>en</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <AppxBundle>Always</AppxBundle>
+    <DefaultLanguage>en</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
     <AppxBundle>Always</AppxBundle>
+    <DefaultLanguage>en</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
     <AppxBundle>Always</AppxBundle>
+    <DefaultLanguage>en</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
     <AppxBundle>Always</AppxBundle>
+    <DefaultLanguage>en</DefaultLanguage>
   </PropertyGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">
@@ -198,10 +208,12 @@
     <Content Include="Images\AppIcons\Wide310x150Logo.scale-400.png" />
     <Content Include="Images\AppIcons\Wide310x150Logo.scale-400_altform-lightunplated.png" />
     <None Include="Package.StoreAssociation.xml" />
+    <None Include="priconfig.default.xml" />
+    <None Include="priconfig.packaging.xml" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\FluentTerminal.App\FluentTerminal.App.csproj" />
-    <ProjectReference Include="..\FluentTerminal.SystemTray\FluentTerminal.SystemTray.csproj" />
+    <ProjectReference Include="$(SolutionDir)FluentTerminal.App\FluentTerminal.App.csproj" />
+    <ProjectReference Include="$(SolutionDir)FluentTerminal.SystemTray\FluentTerminal.SystemTray.csproj" />
   </ItemGroup>
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
 </Project>
diff --git a/FluentTerminal.Package/Package.appxmanifest b/FluentTerminal.Package/Package.appxmanifest
@@ -8,7 +8,7 @@
   xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
   IgnorableNamespaces="uap rescap desktop">
 
-  <Identity Name="53621FSApps.FluentTerminal" Publisher="CN=BDC72197-B634-438A-B863-16DCB7D90C85" Version="0.6.0.0" />
+  <Identity Name="53621FSApps.FluentTerminal" Publisher="CN=BDC72197-B634-438A-B863-16DCB7D90C85" Version="0.6.1.0" />
 
   <Properties>
     <DisplayName>Fluent Terminal</DisplayName>
@@ -26,9 +26,7 @@
   </Resources>
 
   <Applications>
-    <Application Id="App"
-      Executable="$targetnametoken$.exe"
-      EntryPoint="$targetentrypoint$">
+    <Application Id="App" EntryPoint="FluentTerminal.App.App" Executable="FluentTerminal.App\FluentTerminal.App.exe">
       <uap:VisualElements DisplayName="Fluent Terminal" Square150x150Logo="Images\AppIcons\Square150x150Logo.png" Square44x44Logo="Images\AppIcons\Square44x44Logo.png" Description="Fluent Terminal" BackgroundColor="transparent">
         <uap:DefaultTile Wide310x150Logo="Images\AppIcons\Wide310x150Logo.png" ShortName="Fluent Terminal" Square310x310Logo="Images\AppIcons\LargeTile.png" Square71x71Logo="Images\AppIcons\SmallTile.png">
           <uap:ShowNameOnTiles>

diff --git a/FluentTerminal.Package/priconfig.default.xml b/FluentTerminal.Package/priconfig.default.xml
@@ -0,0 +1,3 @@
+<default>
+  <qualifier name="Language" value="de;en;es;fr;hi;pt-BR;ro;ru;zh-CN;it;nl;pl" />
+</default>
diff --git a/FluentTerminal.Package/priconfig.packaging.xml b/FluentTerminal.Package/priconfig.packaging.xml
@@ -0,0 +1,4 @@
+<packaging>
+  <autoResourcePackage qualifier="Scale" />
+  <autoResourcePackage qualifier="DXFeatureLevel" />
+</packaging>
diff --git a/FluentTerminal.sln b/FluentTerminal.sln
@@ -57,7 +57,6 @@ Global
 		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Debug|x64.Build.0 = Debug|x64
 		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Debug|x86.ActiveCfg = Debug|x86
 		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Debug|x86.Build.0 = Debug|x86
-		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Debug|x86.Deploy.0 = Debug|x86
 		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Release|Any CPU.ActiveCfg = Release|x86
 		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Release|ARM.ActiveCfg = Release|ARM
 		{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Release|ARM.Build.0 = Release|ARM