Skip to content

Commit

Permalink
[appstore] revert to using a script to build AppStore bundle
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
pbatard committed Oct 27, 2021
1 parent d5dc8ee commit ca4e009
Show file tree
Hide file tree
Showing 12 changed files with 206 additions and 846 deletions.
2 changes: 0 additions & 2 deletions _chver.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,5 @@ _EOF
# First run sed to substitute our variable in the sed command file
sed -i -e "s/@@MAJOR@@/$MAJOR/g" -e "s/@@MINOR@@/$MINOR/g" cmd.sed
sed -b -i -f cmd.sed src/rufus.rc
sed -b -i -f cmd.sed res/appstore/Package.appxmanifest
sed -b -i -f cmd.sed res/appstore/packme.cmd
rm cmd.sed
source ./bootstrap.sh
2 changes: 0 additions & 2 deletions _pre-commit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ _EOF
sed -i -e "s/@@BUILD@@/$BUILD/g" cmd.sed
# Run sed to update the nano version
sed -b -i -f cmd.sed src/rufus.rc
sed -b -i -f cmd.sed res/appstore/Package.appxmanifest
# NB: we need to run git add else the modified files may be ignored
git add src/rufus.rc
git add res/appstore/Package.appxmanifest

rm cmd.sed
370 changes: 0 additions & 370 deletions res/appstore/Package.StoreAssociation.xml

This file was deleted.

95 changes: 0 additions & 95 deletions res/appstore/Package.appxmanifest

This file was deleted.

65 changes: 65 additions & 0 deletions res/appstore/RufusAppxManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<Package
IgnorableNamespaces="uap uap7 uap8 rescap build"
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
xmlns:uap7="http://schemas.microsoft.com/appx/manifest/uap/windows10/7"
xmlns:uap8="http://schemas.microsoft.com/appx/manifest/uap/windows10/8"
xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
xmlns:build="http://schemas.microsoft.com/developer/appx/2015/build">
<Identity
Name="19453.net.Rufus"
Publisher="CN=7AC86D13-3E5A-491A-ADD5-80095C212740"
Version="@VERSION@"
ProcessorArchitecture="@ARCH@"/>
<Properties>
<DisplayName>Rufus</DisplayName>
<PublisherDisplayName>Akeo Consulting</PublisherDisplayName>
<Logo>Images\StoreLogo.png</Logo>
</Properties>
<Dependencies>
<TargetDeviceFamily
Name="Windows.Desktop"
MinVersion="10.0.14316.0"
MaxVersionTested="10.0.22000.194"/>
<PackageDependency
Name="Microsoft.VCLibs.140.00.UWPDesktop"
MinVersion="14.0.30035.0"
Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"/>
</Dependencies>
<Resources>
<Resource Language="en-US"/>
<Resource uap:Scale="200"/>
</Resources>
<Applications>
<Application
Id="Rufus"
Executable="rufus\rufus.exe"
EntryPoint="Windows.FullTrustApplication">
<uap:VisualElements
DisplayName="Rufus"
Description="Rufus"
BackgroundColor="transparent"
Square150x150Logo="Images\Square150x150Logo.png"
Square44x44Logo="Images\Square44x44Logo.png">
<uap:DefaultTile
Wide310x150Logo="Images\Wide310x150Logo.png"
Square71x71Logo="Images\SmallTile.png"
Square310x310Logo="Images\LargeTile.png">
<uap:ShowNameOnTiles>
<uap:ShowOn Tile="square150x150Logo"/>
<uap:ShowOn Tile="wide310x150Logo"/>
<uap:ShowOn Tile="square310x310Logo"/>
</uap:ShowNameOnTiles>
</uap:DefaultTile>
</uap:VisualElements>
<uap7:Properties>
<uap8:ActiveCodePage>UTF-8</uap8:ActiveCodePage>
</uap7:Properties>
</Application>
</Applications>
<Capabilities>
<rescap:Capability Name="runFullTrust"/>
<rescap:Capability Name="allowElevation"/>
</Capabilities>
</Package>
26 changes: 26 additions & 0 deletions res/appstore/ScaleAppxManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Package
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
IgnorableNamespaces="uap">
<Identity
Name="19453.net.Rufus"
Publisher="CN=7AC86D13-3E5A-491A-ADD5-80095C212740"
Version="@VERSION@"
ResourceId="split.scale-@SCALE@"/>
<Properties>
<ResourcePackage>true</ResourcePackage>
<DisplayName>Rufus</DisplayName>
<PublisherDisplayName>Akeo Consulting</PublisherDisplayName>
<Logo>Images\StoreLogo.png</Logo>
</Properties>
<Resources>
<Resource uap:Scale="@SCALE@"/>
</Resources>
<Dependencies>
<TargetDeviceFamily
Name="Windows.Desktop"
MinVersion="10.0.14316.0"
MaxVersionTested="10.0.22000.194"/>
</Dependencies>
</Package>
144 changes: 0 additions & 144 deletions res/appstore/appstore.sln

This file was deleted.

Loading

0 comments on commit ca4e009

Please sign in to comment.