From fd0c9c505bdb11e023de6e8bfae7a5d116dff322 Mon Sep 17 00:00:00 2001
From: Athanasius <Athanasius@miggy.org>
Date: Fri, 20 Jan 2023 11:33:43 +0000
Subject: [PATCH 1/2] Release: appversion & changelog
* This includes adding a mention of Windows 8.1 EOL to the header.
---
ChangeLog.md | 30 +++++++++++++++---------------
config/__init__.py | 2 +-
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index e3444d4e..e94b376f 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -13,10 +13,17 @@ produce the Windows executables and installer.
**As a consequence of this we no longer support Windows 7.
This is due to
- [Python 3.10.x itself not supporting Windows 7](https://www.python.org/downloads/windows/).
+ [Python 3.10.x and later not supporting Windows 7](https://www.python.org/downloads/windows/).
The application (both EDMarketConnector.exe and EDMC.exe) will crash on
startup due to a missing DLL.**
+ As [Windows 8.1 is now End-Of-Life](https://learn.microsoft.com/en-us/lifecycle/faq/windows#windows-8-1)
+ we no longer explicitly support it, but for the time being it will likely
+ continue to work. This is dependent on future Python releases not dropping
+ support for Windows 8.1 in a manner that prevents it working. Any bug report
+ made against Windows 8.1 use may be ignored unless reproduced on a supported
+ OS.
+
This should have no other impact on users or plugin developers, other
than the latter now being free to use features that were introduced since the
Python 3.7 series.
@@ -27,22 +34,15 @@ produce the Windows executables and installer.
---
-Pre-Release 5.8.0-rc3
+Release 5.8.0
===
-A further issue with building the Windows executable has been found and fixed.
-This release is otherwise identical to 5.8.0-rc1 & -rc2 combined.
+This release is essentially the same as 5.8.0-rc3 with only the version and
+this changelog updated.
----
-
-Pre-Release 5.8.0-rc2
-===
-An issue with building the Windows executable has been found and fixed. This
-release is otherwise identical to 5.8.0-rc1.
-
----
-
-Pre-Release 5.8.0-rc1
-===
+It brings a new feature related to Fleetcarrier data, some convenience for
+Linux users, some fixes, and otherwise some internal changes that should not
+adversely affect either users or third-party plugins. For the latter, read
+below for some new/changed things that could benefit you.
* This release, and all future ones, now create two additional archive files
in the GitHub release:
diff --git a/config/__init__.py b/config/__init__.py
index 0600f689..da573fb1 100644
--- a/config/__init__.py
+++ b/config/__init__.py
@@ -52,7 +52,7 @@ appcmdname = 'EDMC'
# <https://semver.org/#semantic-versioning-specification-semver>
# Major.Minor.Patch(-prerelease)(+buildmetadata)
# NB: Do *not* import this, use the functions appversion() and appversion_nobuild()
-_static_appversion = '5.8.0-rc3'
+_static_appversion = '5.8.0'
_cached_version: Optional[semantic_version.Version] = None
copyright = '© 2015-2019 Jonathan Harris, 2020-2023 EDCD'
From ee5931db4a249eb343b354f7eea912d84db01b32 Mon Sep 17 00:00:00 2001
From: Athanasius <Athanasius@miggy.org>
Date: Fri, 20 Jan 2023 11:46:57 +0000
Subject: [PATCH 2/2] windows-build: Revert WinSparkle DLL to 32-bit, not
64-bit
Some testing of 64-bit builds must have accidentally left this in place.
---
.github/workflows/windows-build.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml
index 3f306884..d28fca90 100644
--- a/.github/workflows/windows-build.yml
+++ b/.github/workflows/windows-build.yml
@@ -108,7 +108,7 @@ jobs:
run: |
Invoke-Webrequest -UseBasicParsing https://github.com/vslavik/winsparkle/releases/download/v0.7.0/WinSparkle-0.7.0.zip -OutFile out.zip
Expand-Archive out.zip
- Move-Item 'out\WinSparkle-0.7.0\x64\Release\*' '.\'
+ Move-Item 'out\WinSparkle-0.7.0\Release\*' '.\'
- name: Build EDMC
run: |