Merge branch 'develop' into feature/sparkle-mac

# Conflicts:
#	.github/workflows/build.yml

13 files changed, 0 insertions, 190 deletions

diff --git a/launcher/updater/testdata/1.json b/launcher/updater/testdata/1.json
deleted file mode 100644
index 7af7e52d..00000000
--- a/launcher/updater/testdata/1.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "ApiVersion": 0,
-    "Id": 1,
-    "Name": "1.0.1",
-    "Files": [
-        {
-            "Path": "fileOne",
-            "Sources": [
-                {
-                    "SourceType": "http",
-                    "Url": "@TEST_DATA_URL@/fileOneA"
-                }
-            ],
-            "Executable": true,
-            "Perms": 493,
-            "MD5": "9eb84090956c484e32cb6c08455a667b"
-        },
-        {
-            "Path": "fileTwo",
-            "Sources": [
-                {
-                    "SourceType": "http",
-                    "Url": "@TEST_DATA_URL@/fileTwo"
-                }
-            ],
-            "Executable": false,
-            "Perms": 644,
-            "MD5": "38f94f54fa3eb72b0ea836538c10b043"
-        },
-        {
-            "Path": "fileThree",
-            "Sources": [
-                {
-                    "SourceType": "http",
-                    "Url": "@TEST_DATA_URL@/fileThree"
-                }
-            ],
-            "Executable": false,
-            "Perms": "750",
-            "MD5": "f12df554b21e320be6471d7154130e70"
-        }
-    ]
-}
diff --git a/launcher/updater/testdata/2.json b/launcher/updater/testdata/2.json
deleted file mode 100644
index 96d430d5..00000000
--- a/launcher/updater/testdata/2.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "ApiVersion": 0,
-    "Id": 1,
-    "Name": "1.0.1",
-    "Files": [
-        {
-            "Path": "fileOne",
-            "Sources": [
-                {
-                    "SourceType": "http",
-                    "Url": "@TEST_DATA_URL@/fileOneB"
-                }
-            ],
-            "Executable": true,
-            "Perms": 493,
-            "MD5": "42915a71277c9016668cce7b82c6b577"
-        },
-        {
-            "Path": "fileTwo",
-            "Sources": [
-                {
-                    "SourceType": "http",
-                    "Url": "@TEST_DATA_URL@/fileTwo"
-                }
-            ],
-            "Executable": false,
-            "Perms": 644,
-            "MD5": "38f94f54fa3eb72b0ea836538c10b043"
-        }
-    ]
-}
diff --git a/launcher/updater/testdata/channels.json b/launcher/updater/testdata/channels.json
deleted file mode 100644
index 5c6e42cb..00000000
--- a/launcher/updater/testdata/channels.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "format_version": 0,
-    "channels": [
-        {
-            "id": "develop",
-            "name": "Develop",
-            "description": "The channel called \"develop\"",
-            "url": "@TEST_DATA_URL@"
-        },
-        {
-            "id": "stable",
-            "name": "Stable",
-            "description": "It's stable at least",
-            "url": "@TEST_DATA_URL@"
-        },
-        {
-            "id": "42",
-            "name": "The Channel",
-            "description": "This is the channel that is going to answer all of your questions",
-            "url": "https://dent.me/tea"
-        }
-    ]
-}
diff --git a/launcher/updater/testdata/errorChannels.json b/launcher/updater/testdata/errorChannels.json
deleted file mode 100644
index a2cb2165..00000000
--- a/launcher/updater/testdata/errorChannels.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "format_version": 0,
-    "channels": [
-        {
-            "id": "",
-            "name": "Develop",
-            "description": "The channel called \"develop\"",
-            "url": "http://example.org/stuff"
-        },
-        {
-            "id": "stable",
-            "name": "",
-            "description": "It's stable at least",
-            "url": "ftp://username@host/path/to/stuff"
-        },
-        {
-            "id": "42",
-            "name": "The Channel",
-            "description": "This is the channel that is going to answer all of your questions",
-            "url": ""
-        }
-    ]
-}
diff --git a/launcher/updater/testdata/fileOneA b/launcher/updater/testdata/fileOneA
deleted file mode 100644
index f2e41136..00000000
--- a/launcher/updater/testdata/fileOneA
+++ /dev/null
@@ -1 +0,0 @@
-stuff
diff --git a/launcher/updater/testdata/fileOneB b/launcher/updater/testdata/fileOneB
deleted file mode 100644
index f9aba922..00000000
--- a/launcher/updater/testdata/fileOneB
+++ /dev/null
@@ -1,3 +0,0 @@
-stuff
-
-more stuff that came in the new version
diff --git a/launcher/updater/testdata/fileThree b/launcher/updater/testdata/fileThree
deleted file mode 100644
index 6353ff16..00000000
--- a/launcher/updater/testdata/fileThree
+++ /dev/null
@@ -1 +0,0 @@
-this is yet another file
diff --git a/launcher/updater/testdata/fileTwo b/launcher/updater/testdata/fileTwo
deleted file mode 100644
index aad9a93a..00000000
--- a/launcher/updater/testdata/fileTwo
+++ /dev/null
@@ -1 +0,0 @@
-some other stuff
diff --git a/launcher/updater/testdata/garbageChannels.json b/launcher/updater/testdata/garbageChannels.json
deleted file mode 100644
index 34437451..00000000
--- a/launcher/updater/testdata/garbageChannels.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "format_version": 0,
-    "channels": [
-        {
-            "id": "develop",
-            "name": "Develop",
-            "description": "The channel called \"develop\"",
-aa            "url": "http://example.org/stuff"
-        },
-a            "id": "stable",
-            "name": "Stable",
-            "description": "It's stable at least",
-            "url": "ftp://username@host/path/to/stuff"
-        },
-        {
-            "id": "42"f
-            "name": "The Channel",
-            "description": "This is the channel that is going to answer all of your questions",
-            "url": "https://dent.me/tea"
-        }
-    ]
-}
diff --git a/launcher/updater/testdata/index.json b/launcher/updater/testdata/index.json
deleted file mode 100644
index 867bdcfb..00000000
--- a/launcher/updater/testdata/index.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "ApiVersion": 0,
-    "Versions": [
-        { "Id": 0, "Name": "1.0.0" },
-        { "Id": 1, "Name": "1.0.1" },
-        { "Id": 2, "Name": "1.0.2" },
-        { "Id": 3, "Name": "1.0.3" }
-    ]
-}
diff --git a/launcher/updater/testdata/noChannels.json b/launcher/updater/testdata/noChannels.json
deleted file mode 100644
index 76988982..00000000
--- a/launcher/updater/testdata/noChannels.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "format_version": 0,
-    "channels": [
-    ]
-}
diff --git a/launcher/updater/testdata/oneChannel.json b/launcher/updater/testdata/oneChannel.json
deleted file mode 100644
index cc8ed255..00000000
--- a/launcher/updater/testdata/oneChannel.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "format_version": 0,
-    "channels": [
-        {
-            "id": "develop",
-            "name": "Develop",
-            "description": "The channel called \"develop\"",
-            "url": "http://example.org/stuff"
-        }
-    ]
-}
diff --git a/launcher/updater/testdata/tst_DownloadTask-test_writeInstallScript.xml b/launcher/updater/testdata/tst_DownloadTask-test_writeInstallScript.xml
deleted file mode 100644
index 38ecc809..00000000
--- a/launcher/updater/testdata/tst_DownloadTask-test_writeInstallScript.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<update version="3">
- <install>
-  <file>
-   <source>sourceOne</source>
-   <dest>destOne</dest>
-   <mode>0777</mode>
-  </file>
-  <file>
-   <source>PolyMC.exe</source>
-   <dest>P/o/l/y/M/C/e/x/e</dest>
-   <mode>0644</mode>
-  </file>
- </install>
- <uninstall>
-  <file>toDelete.abc</file>
- </uninstall>
-</update>