From 34077e775ccc4e88b8e5b4c2a72f93aa0458fed0 Mon Sep 17 00:00:00 2001
From: Felipe Wannmacher <fwannmacher@gmail.com>
Date: Mon, 16 Jan 2023 16:10:36 +0000
Subject: [PATCH] Renewed uwp certificate (#5669)

Added new certificate with expiration set for 100 years
---
 .github/workflows/xbox_one.yml           |  16 +++++++---------
 Packaging/xbox-one/build.bat             |  10 ++--------
 uwp-project/devilutionX_Certificate.pvk  | Bin 1196 -> 0 bytes
 uwp-project/devilutionX_TemporaryKey.pfx | Bin 0 -> 2572 bytes
 uwp-project/devilutionx.vcxproj          |   5 +++--
 5 files changed, 12 insertions(+), 19 deletions(-)
 delete mode 100644 uwp-project/devilutionX_Certificate.pvk
 create mode 100644 uwp-project/devilutionX_TemporaryKey.pfx

diff --git a/.github/workflows/xbox_one.yml b/.github/workflows/xbox_one.yml
index 7f844d665..08165fa5b 100644
--- a/.github/workflows/xbox_one.yml
+++ b/.github/workflows/xbox_one.yml
@@ -1,15 +1,13 @@
 name: Xbox One / Series
 
-# Temporarily disabled due to https://github.com/diasurgical/devilutionX/issues/5661
 on:
-  workflow_dispatch:
-#   push:
-#     branches:
-#       - master
-#   pull_request:
-#     types: [opened, synchronize]
-#   release:
-#     types: [published]
+  push:
+    branches:
+      - master
+  pull_request:
+    types: [opened, synchronize]
+  release:
+    types: [published]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/Packaging/xbox-one/build.bat b/Packaging/xbox-one/build.bat
index 5404dc563..be9a28950 100644
--- a/Packaging/xbox-one/build.bat
+++ b/Packaging/xbox-one/build.bat
@@ -1,13 +1,7 @@
 call VsDevCmd.bat
 
-cd ..\..\uwp-project
-
-makecert /n CN=devilutionX /r /h 0 /eku "1.3.6.1.5.5.7.3.3,1.3.6.1.4.1.311.10.3.13" /sv devilutionX_Certificate.pvk devilutionX_Certificate.cert
-
-pvk2pfx /pvk devilutionX_Certificate.pvk /spc devilutionX_Certificate.cert /pfx devilutionX_TemporaryKey.pfx
-
-mkdir ..\build
-cd ..\build
+mkdir ..\..\build
+cd ..\..\build
 
 git clone https://github.com/libsdl-org/SDL.git
 git -C SDL checkout c7097418711b57e786eeb464bbe366c056b19801
diff --git a/uwp-project/devilutionX_Certificate.pvk b/uwp-project/devilutionX_Certificate.pvk
deleted file mode 100644
index e06fd6fd9fdf22ea439a213d69ed1dae80fbb0f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1196
zcmV;d1XKGS@wKo30000200000000000001#1ONaB0ssI2Bme+XQ$aES2mk;900966
zdm1^+?##H#i)on$>Da}}<?O8pV!cn2|A}fihM1dD#cS0>!_D5kl*UL1xP=B*NS%v{
zw>1~SnPeM1Q<^W6>*-pS2U?}%+?{ZV_#nVS-jgcJ_`~LFU|JK!C;c;f+lhS|+WHk4
z%xt?}ln<|2D8*f4KX~pn6cdGlAA^64#MTH?@~WKGh?Atx*BvOGf~#uYElYWl!oE}D
zH(AyiYp={JP_yZYZ0Wa&sHV;KC$0E5jRQV_ip$HYFq4AqIQDyARgLbCOa)CZ%e6%g
zEJ`$lYVy@G-S{8M8MDyfp2rt3)da%A9kg1-Cv@*j&w;|}XBJTCr_0AtHiy9*)!Mc^
zB8@d(iu{)a0L54^CGPN9&Z1lby6Um8qB`%{6+|K@a!%1bhr`(&tdu4xnI!Q9IdltC
z01Ja+D>9_1fKpjR6BO-5>$z}5Exg6wdDTe@R7_9>ww!WJP4R|7kRYw?TQ>C*Ne|dJ
zfmr+{1TX9B7wxE4myq7dZ@0o<lGLI&e1ks9qi<5aVg!@XFOm`AGquVBXwkSJtPF60
z@WzwbJ0(Y{4_zv>W%_YO@)Z(=<&Gup|5Y-I@G)N7NtCh>X~d5?C>Zl~hH<gXe~nto
zzz-SHDC*l9G`t%`ZE0l6amTXMX`q&ux|%D5BBn-yr+Yt2-QY#U25|oS0xBmN$-pYe
zh~F|yp6sXA>KBLEM)+-@$QQ)`&>eCr%EB#{SUs@A)mWfSs(BAH&NR#%{QvDUy`NW(
zoSp+lKRA}ZFgjmC(=vO#RU%0H6Lb;S2Mt~`7~ZLrY|P?0WL9yisb<p<L@a_z%DUDJ
z*+#dpEPus3#F%99$=-yKTwdM1ySX-IYSC6fA!}dhb<NGqAmd(-nO`tD1^;>yK0Ki3
zcIpAFr0C?&ZRikaZ&ExnUi|_Jl*A@wLsC8l4KJB%u)rD;F<akn!RGC}1T)wpBVLn?
z#N44V-3#ahQIz6|(fZzl<=2%J6IYG;QV$&UwJp{KUvzu$R2UQq0SMvCn>B!r4-J1S
z{oV{Z%Ena6G;Z@Afl|SV=IVeHSIjx+_NXbq7E^gRUkQ48bZ_h%dnf&uKByBQfQGRf
zqZa~cj!nE0DQ-fA3(dF0ZHKSa;5=(18<!g4G6H%&WAuqf8IKFHJie6F^Q_U(pOI{5
z^0HNzXQ2{b#I|VhDyNFTz~<7FWKTZ_3BoRYd$2BJwx^-kRMikRc*rq5pN{q+e<u#}
zO8x^4n=0TRmCZWVy6D*3r#M?d=%7LZeV@2z>{!AFDL^_Clf3!cq@!suNtn8MB9XZK
zTrcdiOXDLE``D8?_18c^SOAMlrFoe#MTBB9)J&b&Z%cy4cuu@XE9nxQ9)x$I(>bVx
zV`%g@JTV`v%YyqR33<UH?b06qr}MLqWb(E55eM_B5LIOKOZt|?yTOwAIvBG3i0KFb
z!3v81AW-v2dQ2Ijf~|2wZR{Y9zj~^#x0|nKTn^UyVdd19#?x!3|Kbtu2Bfg&DiK-*
KecOTGu~P#2OhO?5

diff --git a/uwp-project/devilutionX_TemporaryKey.pfx b/uwp-project/devilutionX_TemporaryKey.pfx
new file mode 100644
index 0000000000000000000000000000000000000000..2b5638e97e6a68064c456f7c8da6b529a7d73d21
GIT binary patch
literal 2572
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

literal 0
HcmV?d00001

diff --git a/uwp-project/devilutionx.vcxproj b/uwp-project/devilutionx.vcxproj
index f141b6acd..3f622eab6 100644
--- a/uwp-project/devilutionx.vcxproj
+++ b/uwp-project/devilutionx.vcxproj
@@ -51,7 +51,6 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <PackageCertificateKeyFile>devilutionX_TemporaryKey.pfx</PackageCertificateKeyFile>
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
@@ -61,6 +60,8 @@
     <AppxBundlePlatforms>x64</AppxBundlePlatforms>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <AppxPackageDir>..\build\uwp-project\AppxPackages</AppxPackageDir>
+    <PackageCertificateThumbprint>0D43FF406F8BFD3F3325F61908D76FBDAB01425C</PackageCertificateThumbprint>
+    <PackageCertificateKeyFile>devilutionX_TemporaryKey.pfx</PackageCertificateKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>..\build\uwp-project\$(Configuration)\</OutDir>
@@ -141,4 +142,4 @@
     <Import Project="$(VSINSTALLDIR)\Common7\IDE\Extensions\Microsoft\VsGraphics\MeshContentTask.targets" />
     <Import Project="$(VSINSTALLDIR)\Common7\IDE\Extensions\Microsoft\VsGraphics\ShaderGraphContentTask.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file