Skip to content

Commit b08fb11

Browse files
felixsefelixse
committed
Increase version, hopefully fixed some packaging issues
1 parent f5c91c1 commit b08fb11

File tree

6 files changed

+29
-10
lines changed

6 files changed

+29
-10
lines changed

‎FluentTerminal.App/FluentTerminal.App.csproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>FluentTerminal.App</RootNamespace>
1111
<AssemblyName>FluentTerminal.App</AssemblyName>
12-
<DefaultLanguage>en-US</DefaultLanguage>
12+
<DefaultLanguage>en</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
1414
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
1515
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
@@ -241,6 +241,9 @@
241241
</ItemGroup>
242242
<ItemGroup>
243243
<Content Include="Properties\Default.rd.xml" />
244+
<PRIResource Include="Strings\it\Resources.resw" />
245+
<PRIResource Include="Strings\nl\Resources.resw" />
246+
<PRIResource Include="Strings\pl\Resources.resw" />
244247
</ItemGroup>
245248
<ItemGroup>
246249
<ApplicationDefinition Include="App.xaml">

‎FluentTerminal.Package/FluentTerminal.Package.wapproj‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,44 +60,54 @@
6060
<DefaultLanguage>en-US</DefaultLanguage>
6161
<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
6262
<PackageCertificateKeyFile>FluentTerminal.App_StoreKey.pfx</PackageCertificateKeyFile>
63-
<EntryPointProjectUniqueName>..\FluentTerminal.App\FluentTerminal.App.csproj</EntryPointProjectUniqueName>
63+
<EntryPointProjectUniqueName>$(SolutionDir)FluentTerminal.App\FluentTerminal.App.csproj</EntryPointProjectUniqueName>
6464
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
6565
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
66-
<GenerateTestArtifacts>True</GenerateTestArtifacts>
66+
<GenerateTestArtifacts>False</GenerateTestArtifacts>
6767
<AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
6868
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
6969
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
7070
<PackageCertificateThumbprint>8A5DE5B20B663BD6A99B44C5BA278289521F419F</PackageCertificateThumbprint>
7171
</PropertyGroup>
7272
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
7373
<AppxBundle>Always</AppxBundle>
74+
<DefaultLanguage>en</DefaultLanguage>
7475
</PropertyGroup>
7576
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
7677
<AppxBundle>Always</AppxBundle>
78+
<DefaultLanguage>en</DefaultLanguage>
7779
</PropertyGroup>
7880
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
7981
<AppxBundle>Always</AppxBundle>
82+
<DefaultLanguage>en</DefaultLanguage>
8083
</PropertyGroup>
8184
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
8285
<AppxBundle>Always</AppxBundle>
86+
<DefaultLanguage>en</DefaultLanguage>
8387
</PropertyGroup>
8488
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8589
<AppxBundle>Always</AppxBundle>
90+
<DefaultLanguage>en</DefaultLanguage>
8691
</PropertyGroup>
8792
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
8893
<AppxBundle>Always</AppxBundle>
94+
<DefaultLanguage>en</DefaultLanguage>
8995
</PropertyGroup>
9096
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
9197
<AppxBundle>Always</AppxBundle>
98+
<DefaultLanguage>en</DefaultLanguage>
9299
</PropertyGroup>
93100
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
94101
<AppxBundle>Always</AppxBundle>
102+
<DefaultLanguage>en</DefaultLanguage>
95103
</PropertyGroup>
96104
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
97105
<AppxBundle>Always</AppxBundle>
106+
<DefaultLanguage>en</DefaultLanguage>
98107
</PropertyGroup>
99108
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
100109
<AppxBundle>Always</AppxBundle>
110+
<DefaultLanguage>en</DefaultLanguage>
101111
</PropertyGroup>
102112
<ItemGroup>
103113
<AppxManifest Include="Package.appxmanifest">
@@ -198,10 +208,12 @@
198208
<Content Include="Images\AppIcons\Wide310x150Logo.scale-400.png" />
199209
<Content Include="Images\AppIcons\Wide310x150Logo.scale-400_altform-lightunplated.png" />
200210
<None Include="Package.StoreAssociation.xml" />
211+
<None Include="priconfig.default.xml" />
212+
<None Include="priconfig.packaging.xml" />
201213
</ItemGroup>
202214
<ItemGroup>
203-
<ProjectReference Include="..\FluentTerminal.App\FluentTerminal.App.csproj" />
204-
<ProjectReference Include="..\FluentTerminal.SystemTray\FluentTerminal.SystemTray.csproj" />
215+
<ProjectReference Include="$(SolutionDir)FluentTerminal.App\FluentTerminal.App.csproj" />
216+
<ProjectReference Include="$(SolutionDir)FluentTerminal.SystemTray\FluentTerminal.SystemTray.csproj" />
205217
</ItemGroup>
206218
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
207219
</Project>

‎FluentTerminal.Package/Package.appxmanifest‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
99
IgnorableNamespaces="uap rescap desktop">
1010

11-
<Identity Name="53621FSApps.FluentTerminal" Publisher="CN=BDC72197-B634-438A-B863-16DCB7D90C85" Version="0.6.0.0" />
11+
<Identity Name="53621FSApps.FluentTerminal" Publisher="CN=BDC72197-B634-438A-B863-16DCB7D90C85" Version="0.6.1.0" />
1212

1313
<Properties>
1414
<DisplayName>Fluent Terminal</DisplayName>
@@ -26,9 +26,7 @@
2626
</Resources>
2727

2828
<Applications>
29-
<Application Id="App"
30-
Executable="$targetnametoken$.exe"
31-
EntryPoint="$targetentrypoint$">
29+
<Application Id="App" EntryPoint="FluentTerminal.App.App" Executable="FluentTerminal.App\FluentTerminal.App.exe">
3230
<uap:VisualElements DisplayName="Fluent Terminal" Square150x150Logo="Images\AppIcons\Square150x150Logo.png" Square44x44Logo="Images\AppIcons\Square44x44Logo.png" Description="Fluent Terminal" BackgroundColor="transparent">
3331
<uap:DefaultTile Wide310x150Logo="Images\AppIcons\Wide310x150Logo.png" ShortName="Fluent Terminal" Square310x310Logo="Images\AppIcons\LargeTile.png" Square71x71Logo="Images\AppIcons\SmallTile.png">
3432
<uap:ShowNameOnTiles>

‎FluentTerminal.Package/priconfig.default.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<default>
2+
<qualifier name="Language" value="de;en;es;fr;hi;pt-BR;ro;ru;zh-CN;it;nl;pl" />
3+
</default>

‎FluentTerminal.Package/priconfig.packaging.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<packaging>
2+
<autoResourcePackage qualifier="Scale" />
3+
<autoResourcePackage qualifier="DXFeatureLevel" />
4+
</packaging>

‎FluentTerminal.sln‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ Global
5757
{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Debug|x64.Build.0 = Debug|x64
5858
{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Debug|x86.ActiveCfg = Debug|x86
5959
{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Debug|x86.Build.0 = Debug|x86
60-
{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Debug|x86.Deploy.0 = Debug|x86
6160
{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Release|Any CPU.ActiveCfg = Release|x86
6261
{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Release|ARM.ActiveCfg = Release|ARM
6362
{41020100-3414-4E0A-9A8E-92D3C4179DF8}.Release|ARM.Build.0 = Release|ARM

0 commit comments

Comments
 (0)