From c109ae78b8d74632430af5fb924c0a4bba5cb55b Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Fri, 31 Jan 2020 09:16:25 +0100
Subject: [PATCH 1/2] Sign UWP packages by default.

---
 python/servo/package_commands.py              |  12 ++++++++----
 support/hololens/ServoApp/ServoApp.vcxproj    |   2 +-
 .../ServoApp/ServoApp_TemporaryKey.pfx        | Bin 2568 -> 2512 bytes
 support/hololens/package.msbuild              |   4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py
index a663763a3985..b4341f1af538 100644
--- a/python/servo/package_commands.py
+++ b/python/servo/package_commands.py
@@ -209,8 +209,11 @@ class PackageCommands(CommandBase):
                      default=None,
                      action='append',
                      help='Create an APPX package')
+    @CommandArgument('--ms-app-store',
+                     default=None,
+                     action='store_true')
     def package(self, release=False, dev=False, android=None, magicleap=None, debug=False,
-                debugger=None, target=None, flavor=None, maven=False, uwp=None):
+                debugger=None, target=None, flavor=None, maven=False, uwp=None, ms_app_store=False):
         if android is None:
             android = self.config["build"]["android"]
         if target and android:
@@ -234,7 +237,7 @@ def package(self, release=False, dev=False, android=None, magicleap=None, debug=
         target_dir = path.dirname(binary_path)
         if uwp:
             vs_info = self.vs_dirs()
-            build_uwp(uwp, dev, vs_info['msbuild'])
+            build_uwp(uwp, dev, vs_info['msbuild'], not ms_app_store)
         elif magicleap:
             if platform.system() not in ["Darwin"]:
                 raise Exception("Magic Leap builds are only supported on macOS.")
@@ -739,7 +742,7 @@ def call_git(cmd, **kwargs):
         return 0
 
 
-def build_uwp(platforms, dev, msbuild_dir):
+def build_uwp(platforms, dev, msbuild_dir, sign_package):
     if any(map(lambda p: p not in ['x64', 'x86', 'arm64'], platforms)):
         raise Exception("Unsupported appx platforms: " + str(platforms))
     if dev and len(platforms) > 1:
@@ -764,7 +767,8 @@ def build_uwp(platforms, dev, msbuild_dir):
         )
         build_file.close()
         # Generate an appxbundle.
-        subprocess.check_call([msbuild, "/m", build_file.name])
+        sign_package_value = "true" if sign_package else "false"
+        subprocess.check_call([msbuild, "/m", build_file.name, "/p:AppxPackageSigningEnabled=" + sign_package_value])
         os.unlink(build_file.name)
 
     print("Creating ZIP")
diff --git a/support/hololens/ServoApp/ServoApp.vcxproj b/support/hololens/ServoApp/ServoApp.vcxproj
index 86873e5dda82..4fa93f76ef6a 100644
--- a/support/hololens/ServoApp/ServoApp.vcxproj
+++ b/support/hololens/ServoApp/ServoApp.vcxproj
@@ -62,6 +62,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
+    <PackageCertificateKeyFile>ServoApp_TemporaryKey.pfx</PackageCertificateKeyFile>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <AppxBundle>Always</AppxBundle>
@@ -69,7 +70,6 @@
     <AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
     <AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
     <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
-    <PackageCertificateThumbprint>45A22CA001C9C6BE412BF449FBE70FEDE635831F</PackageCertificateThumbprint>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
diff --git a/support/hololens/ServoApp/ServoApp_TemporaryKey.pfx b/support/hololens/ServoApp/ServoApp_TemporaryKey.pfx
index 8917164b3bb536b2359938057359e65f28e40f1f..a1224301b62b7df588f4d545addb5783f96b6dff 100644
GIT binary patch
delta 2326
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

delta 2383
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
BWg!3n

diff --git a/support/hololens/package.msbuild b/support/hololens/package.msbuild
index d673876c3500..8d25a8d3fd65 100644
--- a/support/hololens/package.msbuild
+++ b/support/hololens/package.msbuild
@@ -9,6 +9,6 @@
       </ConfigAndPlatform>
     </ItemGroup>
     <MSBuild Projects="%%SOLUTION%%" Targets="Build"
-             Properties="Configuration=%(ConfigAndPlatform.Identity);Platform=%(ConfigAndPlatform.Platform);AppxBundle=Always;AppxBundlePlatforms=%%PACKAGE_PLATFORMS%%;UseSubFolderForOutputDirDuringMultiPlatformBuild=false;AppxPackageSigningEnabled=false"/>
+             Properties="Configuration=%(ConfigAndPlatform.Identity);Platform=%(ConfigAndPlatform.Platform);AppxBundle=Always;AppxBundlePlatforms=%%PACKAGE_PLATFORMS%%;UseSubFolderForOutputDirDuringMultiPlatformBuild=false"/>
   </Target>
-</Project>
\ No newline at end of file
+</Project>

From efaa4c39413ad9027ab48d5b5c5c437b7f46c653 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Fri, 14 Feb 2020 15:53:00 -0500
Subject: [PATCH 2/2] Propagate vslatestinstalled feature to libsimpleservo.

---
 ports/libsimpleservo/api/Cargo.toml  | 3 ++-
 ports/libsimpleservo/capi/Cargo.toml | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/libsimpleservo/api/Cargo.toml b/ports/libsimpleservo/api/Cargo.toml
index 0dd05e38561b..dc4241bf92cb 100644
--- a/ports/libsimpleservo/api/Cargo.toml
+++ b/ports/libsimpleservo/api/Cargo.toml
@@ -50,6 +50,7 @@ no-wgl = ["libservo/no-wgl"]
 oculusvr = ["libservo/oculusvr"]
 profilemozjs = ["libservo/profilemozjs"]
 refcell_backtrace = ["libservo/refcell_backtrace"]
-webdriver = ["libservo/webdriver"]
 uwp = ["libservo/uwp", "webxr/openxr-api"]
+vslatestinstalled = ["libservo/vslatestinstalled"]
+webdriver = ["libservo/webdriver"]
 webgl_backtrace = ["libservo/webgl_backtrace"]
diff --git a/ports/libsimpleservo/capi/Cargo.toml b/ports/libsimpleservo/capi/Cargo.toml
index 2c629587c8f3..f019848ee0be 100644
--- a/ports/libsimpleservo/capi/Cargo.toml
+++ b/ports/libsimpleservo/capi/Cargo.toml
@@ -46,5 +46,6 @@ oculusvr = ["simpleservo/oculusvr"]
 profilemozjs = ["simpleservo/profilemozjs"]
 refcell_backtrace = ["simpleservo/refcell_backtrace"]
 uwp = ["simpleservo/uwp"]
+vslatestinstalled = ["simpleservo/vslatestinstalled"]
 webdriver = ["simpleservo/webdriver"]
 webgl_backtrace = ["simpleservo/webgl_backtrace"]