Merge pull request #1015 from Romanitho/feature/admx_version

Add version in ADMX name.

Author: Romanitho

.github/workflows/GitFlow_Make-Release-and-Sync-to-Dev.yml

@@ -99,13 +99,24 @@ jobs:
 
           # Package ADMX policy templates
           echo "### Zip ADMX ###"
-          Compress-Archive -Path .\Sources\Policies\ADMX -DestinationPath .\WAU_ADMX.zip -Force
+          $admxPath = ".\Sources\Policies\ADMX\WAU.admx"
+          try {
+              (Get-Content $admxPath -Raw -ErrorAction Stop) -match 'revision="([\d\.]+)"' | Out-Null
+              $ADMXversion = $matches[1]
+              $admxZip = "WAU_ADMX_$($ADMXversion).zip"
+          }
+          catch {
+              Write-Host "Error getting WAU ADMX version!"
+              $admxZip = "WAU_ADMX.zip"
+          }
+          Compress-Archive -Path .\Sources\Policies\ADMX -DestinationPath .\$admxZip -Force
           Get-Item .\*.zip
+          echo "admx_zip_name=$admxZip" >> $env:GITHUB_OUTPUT
 
           # Calculate ADMX package hash for verification
           echo "### Get ADMX zip SHA ###"
-          $ADMXSHA = (Get-FileHash .\WAU_ADMX.zip).hash
-          echo " - WAU_ADMX.zip SHA256: $ADMXSHA"
+          $ADMXSHA = (Get-FileHash .\$admxZip).hash
+          echo " - $admxZip SHA256: $ADMXSHA"
           echo "admx_sha=$ADMXSHA" >> $env:GITHUB_OUTPUT
 
       # Step 4: Create stable GitHub release with all artifacts
@@ -116,13 +127,13 @@ jobs:
           prerelease: false  # This is a stable release
           generateReleaseNotes: true
           name: WAU ${{ steps.release_version.outputs.NextSemVer }}
-          artifacts: "WAU.msi,WAU_ADMX.zip"
+          artifacts: "WAU.msi,${{ steps.build_project.outputs.admx_zip_name }}"
           body: |
             ## Files
             |Files|Hash (SHA256)|Downloads|
             |---|---|---|
             |[WAU.msi](https://github.com/Romanitho/Winget-AutoUpdate/releases/download/v${{ steps.release_version.outputs.NextSemVer }}/WAU.msi) (x64)|`${{ steps.build_project.outputs.msi_sha }}`|<picture>![WAU.msi](https://img.shields.io/github/downloads/Romanitho/Winget-AutoUpdate/v${{ steps.release_version.outputs.NextSemVer }}/WAU.msi?style=flat-square&label=&color=blue)</picture>|
-            |[WAU_ADMX.zip](https://github.com/Romanitho/Winget-AutoUpdate/releases/download/v${{ steps.release_version.outputs.NextSemVer }}/WAU_ADMX.zip)|`${{ steps.build_project.outputs.admx_sha }}`|<picture>![WAU_ADMX.zip](https://img.shields.io/github/downloads/Romanitho/Winget-AutoUpdate/v${{ steps.release_version.outputs.NextSemVer }}/WAU_ADMX.zip?style=flat-square&label=&color=blue)</picture>|
+            |[${{ steps.build_project.outputs.admx_zip_name }}](https://github.com/Romanitho/Winget-AutoUpdate/releases/download/v${{ steps.release_version.outputs.NextSemVer }}/${{ steps.build_project.outputs.admx_zip_name }})|`${{ steps.build_project.outputs.admx_sha }}`|<picture>![${{ steps.build_project.outputs.admx_zip_name }}](https://img.shields.io/github/downloads/Romanitho/Winget-AutoUpdate/v${{ steps.release_version.outputs.NextSemVer }}/${{ steps.build_project.outputs.admx_zip_name }}?style=flat-square&label=&color=blue)</picture>|
 
   sync:
     name: Sync develop with main

.github/workflows/GitFlow_Nightly-builds.yml

@@ -2,7 +2,7 @@
 # - Checks for merged PRs since the last tag
 # - Creates a pre-release version if changes are detected
 # - Builds and packages the software
-# - Creates GitHub release with artifacts and download counters
+# - Creates GitHub release with artifacts
 
 name: GitFlow | Nightly Builds
 
@@ -43,28 +43,28 @@ jobs:
           # Get the latest release tag (any type)
           $LATEST_TAG = git tag -l --sort=-version:refname | Select-Object -First 1
           Write-Host "Latest release: $LATEST_TAG"
-          
+
           # Get all merged PRs since last tag (only merge commits from PRs)
           $MERGED_PRS = git log --merges --grep="Merge pull request" --pretty=format:"%h %s" "$LATEST_TAG..develop"
-          
+
           # Count merges
           $MERGE_COUNT = ($MERGED_PRS | Measure-Object).Count
-          
+
           if ($MERGE_COUNT -eq 0) {
               Write-Host "No PRs merged to develop since last tag. Skipping build."
               $BUILD_NEEDED = $false
           }
           else {
               Write-Host "Merged PRs since last tag (develop):"
               Write-Host $MERGED_PRS
-          
+
               if ($MERGE_COUNT -eq 1 -and $MERGED_PRS -match "Merge pull request #\d+ from .*/release/") {
                   Write-Host "Only change since last tag is a release PR merge. Skipping build."
                   $BUILD_NEEDED = $false
               }
               else {
                   $BUILD_NEEDED = $true
-          
+
                   # Set release type for output (adapts to your previous logic if you need it)
                   if ($LATEST_TAG -like "*-*") {
                       $RELEASE_TYPE = "prerelease"
@@ -158,13 +158,24 @@ jobs:
 
           # Package ADMX policy templates
           echo "### Zip ADMX ###"
-          Compress-Archive -Path .\Sources\Policies\ADMX -DestinationPath .\WAU_ADMX.zip -Force
+          $admxPath = ".\Sources\Policies\ADMX\WAU.admx"
+          try {
+              (Get-Content $admxPath -Raw -ErrorAction Stop) -match 'revision="([\d\.]+)"' | Out-Null
+              $ADMXversion = $matches[1]
+              $admxZip = "WAU_ADMX_$($ADMXversion).zip"
+          }
+          catch {
+              Write-Host "Error getting WAU ADMX version!"
+              $admxZip = "WAU_ADMX.zip"
+          }
+          Compress-Archive -Path .\Sources\Policies\ADMX -DestinationPath .\$admxZip -Force
           Get-Item .\*.zip
+          echo "admx_zip_name=$admxZip" >> $env:GITHUB_OUTPUT
 
           # Calculate ADMX package hash for verification
           echo "### Get ADMX zip SHA ###"
-          $ADMXSHA = (Get-FileHash .\WAU_ADMX.zip).hash
-          echo " - WAU_ADMX.zip SHA256: $ADMXSHA"
+          $ADMXSHA = (Get-FileHash .\$admxZip).hash
+          echo " - $admxZip SHA256: $ADMXSHA"
           echo "admx_sha=$ADMXSHA" >> $env:GITHUB_OUTPUT
 
       # Step 6: Create GitHub release with all artifacts
@@ -177,7 +188,7 @@ jobs:
           prerelease: true
           generateReleaseNotes: true
           name: ${{ steps.format_version.outputs.ReleaseName }}
-          artifacts: "WAU.msi,WAU_ADMX.zip"
+          artifacts: "WAU.msi,${{ steps.build_project.outputs.admx_zip_name }}"
           body: |
             ${{ steps.format_version.outputs.ReleaseBodyIntro }}
 
@@ -187,4 +198,4 @@ jobs:
             |Files|Hash (SHA256)|Downloads|
             |---|---|---|
             |[WAU.msi](https://github.com/Romanitho/Winget-AutoUpdate/releases/download/v${{ steps.format_version.outputs.NextSemVer }}/WAU.msi) (x64)|`${{ steps.build_project.outputs.msi_sha }}`|<picture>![WAU.msi](https://img.shields.io/github/downloads/Romanitho/Winget-AutoUpdate/v${{ steps.format_version.outputs.NextSemVer }}/WAU.msi?style=flat-square&label=&color=blue)</picture>|
-            |[WAU_ADMX.zip](https://github.com/Romanitho/Winget-AutoUpdate/releases/download/v${{ steps.format_version.outputs.NextSemVer }}/WAU_ADMX.zip)|`${{ steps.build_project.outputs.admx_sha }}`|<picture>![WAU_ADMX.zip](https://img.shields.io/github/downloads/Romanitho/Winget-AutoUpdate/v${{ steps.format_version.outputs.NextSemVer }}/WAU_ADMX.zip?style=flat-square&label=&color=blue)</picture>|
+            |[${{ steps.build_project.outputs.admx_zip_name }}](https://github.com/Romanitho/Winget-AutoUpdate/releases/download/v${{ steps.format_version.outputs.NextSemVer }}/${{ steps.build_project.outputs.admx_zip_name }})|`${{ steps.build_project.outputs.admx_sha }}`|<picture>![${{ steps.build_project.outputs.admx_zip_name }}](https://img.shields.io/github/downloads/Romanitho/Winget-AutoUpdate/v${{ steps.format_version.outputs.NextSemVer }}/${{ steps.build_project.outputs.admx_zip_name }}?style=flat-square&label=&color=blue)</picture>|

README.md

@@ -39,15 +39,15 @@ You can update only pre-selected apps. To do so, create an "included_apps.txt" w
 
 > The lists can contain Wildcard (*). For instance ```Mozilla.Firefox*``` will take care of all Firefox channels.
 
-List and Mods folder content will be copied to WAU install location:  
+List and Mods folder content will be copied to WAU install location:
 ![explorer](https://github.com/user-attachments/assets/a37837b0-b61e-4ce7-b23c-fd8661585e40)
 
 
 ### Notification Level
 You can choose which notification will be displayed: `Full`, `Success only`, `Errors only` or `None`.
 
 ### Notification language
-You can easily translate toast notifications by creating your locale xml config file (and share it with us :) ).
+You can easily translate toast notifications by creating your locale xml config file (and share it with us 😉).
 
 ### When does the script run?
 WAU runs ,by default, at logon. You can configure the frequency with options (Daily, BiDaily, Weekly, BiWeekly, Monthly or Never).
@@ -110,7 +110,8 @@ It doesn't work to call Powershell in **CMD** to install **WAU** with the parame
 Instead you must escape **every** special character (notice the `%` escape too) like:<br>
 `-ListPath https://storagesample.blob.core.windows.net/sample-container^?v=2023-11-31^&sr=b^&sig=39Up9jzHkxhUIhFEjEh9594DIxe6cIRCgOVOICGSP%%3A377^&sp=rcw`
 
-If `-ListPath` is set to **GPO** the Black/White List can be managed from within the GPO itself under **Application GPO Blacklist**/**Application GPO Whitelist**. Thanks to [Weatherlights](https://github.com/Weatherlights) in [#256 (reply in thread)](https://github.com/Romanitho/Winget-AutoUpdate/discussions/256#discussioncomment-4710599)!
+
+If a blacklist or whitelist is configured via Group Policy (GPO), WAU will automatically use these settings. There is no longer a need to specify "GPO" as a value for `ListPath`, detection is automatic as soon as a list is defined in Group Policy.
 
 
 ### MODSPATH
@@ -162,7 +163,7 @@ Default value 6AM (06:00:00). Specify the time of the update interval execution
 
 ### UPDATESATTIMEDELAY
 Default value is none (00:00). This setting specifies the delay for the scheduled task.
-A scheduled task random delay adds a random amount of wait time (up to the specified maximum) before the task starts. 
+A scheduled task random delay adds a random amount of wait time (up to the specified maximum) before the task starts.
 This helps prevent many devices from running the task at the exact same time. This is not applicable to "on logon" triggers.
 
 ### DONOTRUNONMETERED
@@ -268,4 +269,3 @@ Feel free to give us any suggestions or optimizations in code and support us by
 [![GitHub release (release name instead of tag name)](https://img.shields.io/github/v/release/Romanitho/Winget-AutoUpdate?display_name=release&include_prereleases&label=Latest%20Release&style=flat-square)](https://github.com/Romanitho/Winget-AutoUpdate/releases/)
 
 </div>
-

Sources/Policies/README.md

@@ -7,25 +7,24 @@ In an enterprise environment, it's crucial that different groups can have differ
 ## Administrative Template
 
 ### To an Individual Computer
-1. Copy the **`WAU.admx`** file to your Policy Definitions template folder.  
-   Example: `C:\Windows\PolicyDefinitions`
-2. Copy the **`WAU.adml`** file to the matching language folder in your Policy Definitions folder.  
-   Example: `C:\Windows\PolicyDefinitions\en-US`
+1. Copy the **`WAU.admx`** file to your Policy Definitions template folder.
+   >Example: `C:\Windows\PolicyDefinitions`
+2. Copy the **`WAU.adml`** file to the matching language folder in your Policy Definitions folder.
+   >Example: `C:\Windows\PolicyDefinitions\en-US`
 
 ### To Active Directory
 1. On a domain controller or workstation with [RSAT](https://learn.microsoft.com/en-us/troubleshoot/windows-server/system-management-components/remote-server-administration-tools), go to the **PolicyDefinitions** folder (also known as the _Central Store_) on any domain controller for your domain.
-2. Copy the **`WAU.admx`** file to the PolicyDefinitions folder.  
-   Example: `%systemroot%\sysvol\domain\policies\PolicyDefinitions`
-3. Copy the **`WAU.adml`** file to the matching language folder in the PolicyDefinitions folder. Create the folder if it doesn't already exist.  
-   Example: `%systemroot%\sysvol\domain\policies\PolicyDefinitions\en-US`
+2. Copy the **`WAU.admx`** file to the PolicyDefinitions folder.
+   >Example: `%systemroot%\sysvol\domain\policies\PolicyDefinitions`
+3. Copy the **`WAU.adml`** file to the matching language folder in the PolicyDefinitions folder. Create the folder if it doesn't already exist.
+   >Example: `%systemroot%\sysvol\domain\policies\PolicyDefinitions\en-US`
 4. If your domain has more than one domain controller, the new [ADMX files](https://learn.microsoft.com/en-us/troubleshoot/windows-client/group-policy/create-and-manage-central-store) will be replicated to them at the next domain replication interval.
 
 ## Intune
 
-Please follow the comprehensive Microsoft documentation to import and manage the WAU policies:  
+Please follow the comprehensive Microsoft documentation to import and manage the WAU policies:
 [Import and Manage Administrative Templates in Intune](https://learn.microsoft.com/en-us/mem/intune-service/configuration/administrative-templates-import-custom#add-the-admx-and-adml-files)
 
 ## Important Notes
 
-- When using GPO or Intune policies, you need to enable `Activate WAU GPO Management` for the policies to work. This setting is not intuitive and should be part of any decommissioning considerations.
 - This project only supports the `en-US` ADML file.

Sources/Winget-AutoUpdate/config/WAU-MSI_Actions.ps1

@@ -164,15 +164,6 @@ function Install-WingetAutoUpdate {
 
         }
 
-        #Add 1 to Github counter file
-        try {
-            Invoke-WebRequest -Uri "https://github.com/Romanitho/Winget-AutoUpdate/releases/download/v$($WAUconfig.ProductVersion)/WAU_InstallCounter" -UseBasicParsing | Out-Null
-            Write-Host "-> Reported installation."
-        }
-        catch {
-            Write-Host "-> Not able to report installation."
-        }
-
         Write-Host "### WAU MSI Post actions succeeded! ###"
 
     }