Skip to content

Commit ca4e009

Browse files
committed
[appstore] revert to using a script to build AppStore bundle
* Having two separate Visual Studio solution files, while more convenient, was a major pain in the ass and it also required us to update versioning in the .appxmanifest for each commit. * Also, this new AppStore build process enables us to use the GitHub Actions executables to further foster the complete transparency of our build process.
1 parent d5dc8ee commit ca4e009

12 files changed

+206
-846
lines changed

_chver.sh

-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,5 @@ _EOF
3333
# First run sed to substitute our variable in the sed command file
3434
sed -i -e "s/@@MAJOR@@/$MAJOR/g" -e "s/@@MINOR@@/$MINOR/g" cmd.sed
3535
sed -b -i -f cmd.sed src/rufus.rc
36-
sed -b -i -f cmd.sed res/appstore/Package.appxmanifest
37-
sed -b -i -f cmd.sed res/appstore/packme.cmd
3836
rm cmd.sed
3937
source ./bootstrap.sh

_pre-commit.sh

-2
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ _EOF
3838
sed -i -e "s/@@BUILD@@/$BUILD/g" cmd.sed
3939
# Run sed to update the nano version
4040
sed -b -i -f cmd.sed src/rufus.rc
41-
sed -b -i -f cmd.sed res/appstore/Package.appxmanifest
4241
# NB: we need to run git add else the modified files may be ignored
4342
git add src/rufus.rc
44-
git add res/appstore/Package.appxmanifest
4543

4644
rm cmd.sed

res/appstore/Package.StoreAssociation.xml

-370
This file was deleted.

res/appstore/Package.appxmanifest

-95
This file was deleted.

res/appstore/RufusAppxManifest.xml

+65
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2+
<Package
3+
IgnorableNamespaces="uap uap7 uap8 rescap build"
4+
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
5+
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
6+
xmlns:uap7="http://schemas.microsoft.com/appx/manifest/uap/windows10/7"
7+
xmlns:uap8="http://schemas.microsoft.com/appx/manifest/uap/windows10/8"
8+
xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
9+
xmlns:build="http://schemas.microsoft.com/developer/appx/2015/build">
10+
<Identity
11+
Name="19453.net.Rufus"
12+
Publisher="CN=7AC86D13-3E5A-491A-ADD5-80095C212740"
13+
Version="@VERSION@"
14+
ProcessorArchitecture="@ARCH@"/>
15+
<Properties>
16+
<DisplayName>Rufus</DisplayName>
17+
<PublisherDisplayName>Akeo Consulting</PublisherDisplayName>
18+
<Logo>Images\StoreLogo.png</Logo>
19+
</Properties>
20+
<Dependencies>
21+
<TargetDeviceFamily
22+
Name="Windows.Desktop"
23+
MinVersion="10.0.14316.0"
24+
MaxVersionTested="10.0.22000.194"/>
25+
<PackageDependency
26+
Name="Microsoft.VCLibs.140.00.UWPDesktop"
27+
MinVersion="14.0.30035.0"
28+
Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"/>
29+
</Dependencies>
30+
<Resources>
31+
<Resource Language="en-US"/>
32+
<Resource uap:Scale="200"/>
33+
</Resources>
34+
<Applications>
35+
<Application
36+
Id="Rufus"
37+
Executable="rufus\rufus.exe"
38+
EntryPoint="Windows.FullTrustApplication">
39+
<uap:VisualElements
40+
DisplayName="Rufus"
41+
Description="Rufus"
42+
BackgroundColor="transparent"
43+
Square150x150Logo="Images\Square150x150Logo.png"
44+
Square44x44Logo="Images\Square44x44Logo.png">
45+
<uap:DefaultTile
46+
Wide310x150Logo="Images\Wide310x150Logo.png"
47+
Square71x71Logo="Images\SmallTile.png"
48+
Square310x310Logo="Images\LargeTile.png">
49+
<uap:ShowNameOnTiles>
50+
<uap:ShowOn Tile="square150x150Logo"/>
51+
<uap:ShowOn Tile="wide310x150Logo"/>
52+
<uap:ShowOn Tile="square310x310Logo"/>
53+
</uap:ShowNameOnTiles>
54+
</uap:DefaultTile>
55+
</uap:VisualElements>
56+
<uap7:Properties>
57+
<uap8:ActiveCodePage>UTF-8</uap8:ActiveCodePage>
58+
</uap7:Properties>
59+
</Application>
60+
</Applications>
61+
<Capabilities>
62+
<rescap:Capability Name="runFullTrust"/>
63+
<rescap:Capability Name="allowElevation"/>
64+
</Capabilities>
65+
</Package>

res/appstore/ScaleAppxManifest.xml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<Package
3+
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
4+
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
5+
IgnorableNamespaces="uap">
6+
<Identity
7+
Name="19453.net.Rufus"
8+
Publisher="CN=7AC86D13-3E5A-491A-ADD5-80095C212740"
9+
Version="@VERSION@"
10+
ResourceId="split.scale-@SCALE@"/>
11+
<Properties>
12+
<ResourcePackage>true</ResourcePackage>
13+
<DisplayName>Rufus</DisplayName>
14+
<PublisherDisplayName>Akeo Consulting</PublisherDisplayName>
15+
<Logo>Images\StoreLogo.png</Logo>
16+
</Properties>
17+
<Resources>
18+
<Resource uap:Scale="@SCALE@"/>
19+
</Resources>
20+
<Dependencies>
21+
<TargetDeviceFamily
22+
Name="Windows.Desktop"
23+
MinVersion="10.0.14316.0"
24+
MaxVersionTested="10.0.22000.194"/>
25+
</Dependencies>
26+
</Package>

res/appstore/appstore.sln

-144
This file was deleted.

0 commit comments

Comments
 (0)