From 31caee81834d4b84a3ecb3914d1828b6f7cac407 Mon Sep 17 00:00:00 2001
From: datadiode <datadiode@users.noreply.github.com>
Date: Thu, 5 Oct 2023 12:52:34 +0200
Subject: [PATCH] https://ci.appveyor.com/tools/encrypt / Change VirusTotal
 JSON report filename extension to .jsn to make it HTA iframe friendly / Make
 builds reproducible with help of https://github.com/jasonwhite/ducible

---
 .gitmodules                    |  5 ++++-
 BrowserProxy/BrowserProxy.rc   |  4 ++--
 Installer/MakeSetup.bat        |  6 ++++++
 Installer/OpennessWebView2.ddf | 10 +++++-----
 UnityDoorstop-BSIPA            |  1 +
 appveyor.yml                   | 12 ++++++++++--
 6 files changed, 28 insertions(+), 10 deletions(-)
 create mode 160000 UnityDoorstop-BSIPA

diff --git a/.gitmodules b/.gitmodules
index f695563..8e3e3ea 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "Extras"]
 	path = Extras
-	url = git@github.com:hmphus/there-edge-extras.git
+	url = https://github.com/hmphus/there-edge-extras
+[submodule "UnityDoorstop-BSIPA"]
+	path = UnityDoorstop-BSIPA
+	url = https://github.com/nike4613/UnityDoorstop-BSIPA
diff --git a/BrowserProxy/BrowserProxy.rc b/BrowserProxy/BrowserProxy.rc
index 8ab3ea6..2ebdf05 100644
--- a/BrowserProxy/BrowserProxy.rc
+++ b/BrowserProxy/BrowserProxy.rc
@@ -58,8 +58,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,1,2,4
- PRODUCTVERSION 1,1,2,4
+ FILEVERSION 1,01,02,04
+ PRODUCTVERSION 1,01,02,04
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
diff --git a/Installer/MakeSetup.bat b/Installer/MakeSetup.bat
index feec9cb..6bdbeb1 100644
--- a/Installer/MakeSetup.bat
+++ b/Installer/MakeSetup.bat
@@ -1,8 +1,14 @@
 @echo off
 cd "%~dp0"
+set ducible.exe="..\UnityDoorstop-BSIPA\BuildUtils\ducible.exe"
+for /f "tokens=*" %%G in ('where git.exe') do (set git.exe="%%G")
+set touch.exe=%git.exe:cmd\git.exe=usr\bin\touch.exe%
 REM Read the version number from the resource file
 for /f "tokens=1,2" %%G in (..\BrowserProxy\BrowserProxy.rc) do if "%%G" == "FILEVERSION" set FILEVERSION=%%H
 echo FILEVERSION=%FILEVERSION:,=.%
+%ducible.exe% ..\BrowserProxy\Release\OpennessWebView2.dll
+for /f delims^=^"^ tokens^=2 %%G in (OpennessWebView2.ddf) do %touch.exe% -t 20230%FILEVERSION:,=% %~dp0%%G
+set FILEVERSION=%FILEVERSION:,0=,%
 REM Create the CAB
 makecab /f OpennessWebView2.ddf
 REM Create the SFX
diff --git a/Installer/OpennessWebView2.ddf b/Installer/OpennessWebView2.ddf
index eb97d58..98add15 100644
--- a/Installer/OpennessWebView2.ddf
+++ b/Installer/OpennessWebView2.ddf
@@ -5,9 +5,9 @@
 .Set Cabinet=on
 .Set Compress=on
 .Set CompressionType=LZX
-
 .Set CompressionMemory=18
-"..\LICENSE.md" "LICENSE.md"
-"..\BrowserProxy\Release\OpennessWebView2.dll" "OpennessWebView2.dll"
-"setup.bat" "setup.bat"
-"..\BrowserProxy\Release\WebView2Loader.dll" "WebView2Loader.dll"
+
+	"..\LICENSE.md" "LICENSE.md"
+	"..\BrowserProxy\Release\OpennessWebView2.dll" "OpennessWebView2.dll"
+	"setup.bat" "setup.bat"
+	"..\BrowserProxy\Release\WebView2Loader.dll" "WebView2Loader.dll"
diff --git a/UnityDoorstop-BSIPA b/UnityDoorstop-BSIPA
new file mode 160000
index 0000000..7fc2aee
--- /dev/null
+++ b/UnityDoorstop-BSIPA
@@ -0,0 +1 @@
+Subproject commit 7fc2aee268918751c46e6c4523a21175ad625b43
diff --git a/appveyor.yml b/appveyor.yml
index 76448e4..9b78f7c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,14 @@
 version: 1.0.{build}
 image: Visual Studio 2022
 
+clone_script:
+- git clone -q --recursive --branch=%APPVEYOR_REPO_BRANCH% https://github.com/%APPVEYOR_REPO_NAME%.git %APPVEYOR_BUILD_FOLDER%
+- git checkout -qf %APPVEYOR_REPO_COMMIT%
+
+environment:
+  VIRUSTOTAL_API_KEY:
+    secure: 6VgzXytQY3l+cUPsvEuhSqu/E8JqJQPOK1Kh7mViN0SJ1M3ZHzteSpC56q3HbWXSUCAhk7ynS0BVBYDWVxi5XSXdRLCRiWaAgG7zeNoNk6Q=
+
 configuration:
 - Release
 
@@ -15,9 +23,9 @@ build:
 
 after_build:
 - Installer\MakeSetup.bat
-- bash.exe %APPVEYOR_BUILD_FOLDER%\virustotal_upload %APPVEYOR_BUILD_FOLDER%\Installer\OpennessWebView2.exe %APPVEYOR_BUILD_FOLDER%\Installer\virustotal_report.json
+- bash.exe %APPVEYOR_BUILD_FOLDER%\virustotal_upload %APPVEYOR_BUILD_FOLDER%\Installer\OpennessWebView2.exe %APPVEYOR_BUILD_FOLDER%\Installer\virustotal_report.jsn
 
 artifacts:
 - path: BrowserProxy\$(configuration)\OpennessWebView2.dll
 - path: Installer\OpennessWebView2.exe
-- path: Installer\virustotal_report.json
+- path: Installer\virustotal_report.jsn