WinPB: Update WiX Version (#3954)

* WinPB: Update WiX Version

* WinPB: Update cygwin download checksum

* WinPB: Update WiX Version Task Improvement

Author: steelhead31

ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/WiX/tasks/main.yml

@@ -4,7 +4,7 @@
 ###############
 - name: Set Wix version variable
   set_fact:
-    wix_version: 5.0.2
+    wix_version: 6.0.0
   tags: Wix
 
 - name: Test if WiX is already installed
@@ -46,8 +46,13 @@
   when: wix_installed.stat.exists
   tags: Wix
 
-- name: Install Wix Toolset when not installed or version is not correct
-  win_shell: dotnet tool install wix --version {{ wix_version }} --tool-path 'C:\\Program Files\\dotnet'
+- name: Install Wix Toolset when not installed or update when version is not correct
+  win_shell: |
+    if (dotnet tool list --tool-path 'C:\\Program Files\\dotnet' | Select-String wix) {
+      dotnet tool update wix --version {{ wix_version }} --tool-path 'C:\\Program Files\\dotnet'
+    } else {
+      dotnet tool install wix --version {{ wix_version }} --tool-path 'C:\\Program Files\\dotnet'
+    }
   when: (not wix_installed.stat.exists) or (installed_wix_version.stdout.find(wix_version) == -1)
   tags: Wix
 

ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/cygwin/tasks/main.yml

@@ -13,7 +13,7 @@
     url: https://cygwin.com/setup-x86_64.exe
     dest: C:\temp\cygwin.exe
     force: no
-    checksum: 2e2e322b138f6337d1a9be71cc0d3b9bb05991c5ac72bd68cf3c1c5f309ecf30
+    checksum: 46993d76d756bde18564f72a4ee07384cd82b447527ca406c8bfc034cb05c664
     checksum_algorithm: sha256
   when: not cygwin_installed.stat.exists
   register: cygwin_download