From 2d1ad6c0454bf5bdf8ca41a57c8c66f54884a88d Mon Sep 17 00:00:00 2001
From: krzywon <krzywon@yahoo.com>
Date: Thu, 3 Oct 2024 08:54:47 -0400
Subject: [PATCH 1/4] Reset version to match the expect form of 'X.Y.Z' and add
 a note for future developers

---
 src/sas/system/version.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/sas/system/version.py b/src/sas/system/version.py
index 8450cf5327..f2ad9d171e 100644
--- a/src/sas/system/version.py
+++ b/src/sas/system/version.py
@@ -1,3 +1,4 @@
-__version__ = "6.0.0rc1"
+# Version must be of the form 'X.Y.Z'. No alpha/beta/rc versioning should be set here
+__version__ = "6.0.0"
 __release_date__ = "2024"
 __build__ = "GIT_COMMIT"

From 9ccf3a4e81c0e7275d2d3e2f948b79892fc9596c Mon Sep 17 00:00:00 2001
From: krzywon <krzywon@yahoo.com>
Date: Thu, 3 Oct 2024 09:22:43 -0400
Subject: [PATCH 2/4] Set all versions to 6.0.0 for final release candidate

---
 docs/sphinx-docs/source/conf.py | 2 +-
 installers/installer.iss        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/sphinx-docs/source/conf.py b/docs/sphinx-docs/source/conf.py
index 7366dc26a4..065edfa823 100644
--- a/docs/sphinx-docs/source/conf.py
+++ b/docs/sphinx-docs/source/conf.py
@@ -87,7 +87,7 @@
 # The short X.Y version.
 version = '6.0'
 # The full version, including e.g. alpha tags (a1).
-release = '6.0.0rc1'
+release = '6.0.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/installers/installer.iss b/installers/installer.iss
index 4194b38153..f90b2eea2a 100644
--- a/installers/installer.iss
+++ b/installers/installer.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "SasView"
-#define MyAppVersion "6.0.0rc1"
+#define MyAppVersion "6.0.0"
 #define MyAppPublisher "(c) 2009 - 2024, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft and DLS"
 #define MyAppURL "http://www.sasview.org"
 #define MyAppExeName "sasview.exe"

From 282f963d5aabaddc657f7287e38f966fd87435be Mon Sep 17 00:00:00 2001
From: krzywon <krzywon@yahoo.com>
Date: Thu, 3 Oct 2024 12:14:41 -0400
Subject: [PATCH 3/4] Setup android SDK for windows binary signing

---
 .github/workflows/ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d384c9285e..771446fe4d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -277,6 +277,10 @@ jobs:
         with:
           product-path: "installers/dist/SasView6.dmg"
 
+      - name: Setup Android SDK
+        if: ${{ matrix.installer && startsWith(matrix.os, 'windows') }}
+        uses: android-actions/setup-android@v3
+
       - name: Sign binary
         if: ${{ matrix.installer && startsWith(matrix.os, 'windows') }}
         uses: lando/code-sign-action@v2

From 38de3c9e03dcf10bc46e2bb7b152816c8ebe4adf Mon Sep 17 00:00:00 2001
From: krzywon <krzywon@yahoo.com>
Date: Thu, 3 Oct 2024 14:23:08 -0400
Subject: [PATCH 4/4] Remove SDK installation since it is unnecessary

---
 .github/workflows/ci.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 771446fe4d..d384c9285e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -277,10 +277,6 @@ jobs:
         with:
           product-path: "installers/dist/SasView6.dmg"
 
-      - name: Setup Android SDK
-        if: ${{ matrix.installer && startsWith(matrix.os, 'windows') }}
-        uses: android-actions/setup-android@v3
-
       - name: Sign binary
         if: ${{ matrix.installer && startsWith(matrix.os, 'windows') }}
         uses: lando/code-sign-action@v2