Merge branch 'master' into develop

Author: bytedreamer

ci/package.yml

@@ -4,6 +4,29 @@ steps:
     inputs:
       packageType: 'sdk'
       version: '8.x'
+      
+  - task: PowerShell@2
+    displayName: 'Increment patch version'
+    inputs:
+      targetType: 'inline'
+      script: |
+        # Configure git for the build agent
+        git config --global user.email "[email protected]"
+        git config --global user.name "Azure DevOps Build Agent"
+
+        # Get current version for display
+        $currentVersion = & "$(Build.SourcesDirectory)/scripts/Get-Version.ps1" -Format Simple
+        Write-Host "Packaging completed successfully. Current version: $currentVersion"
+
+        # Increment patch version
+        & "$(Build.SourcesDirectory)/scripts/Increment-Version.ps1" -IncrementType Patch
+
+        # Get new version
+        $newVersion = & "$(Build.SourcesDirectory)/scripts/Get-Version.ps1" -Format Simple
+        Write-Host "New version: $newVersion"
+
+        # Set pipeline variable for later use
+        Write-Host "##vso[task.setvariable variable=NewVersion]$newVersion"
 
   - task: DotNetCoreCLI@2
     displayName: 'dotnet pack'
@@ -49,7 +72,7 @@ steps:
       publishWebProjects: false
       zipAfterPublish: false
       modifyOutputPath: false
-      projects: 'src/ACUConsole/ACUConsole.csproj'
+      projects: 'src/ACUConsole/ACUConsole.csproj'      
       arguments: '-r linux-arm64 --configuration $(BuildConfiguration) --self-contained true -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -p:IncludeAllContentForSelfExtract=true --output $(Build.ArtifactStagingDirectory)/TestConsole/linux-arm64'
 
   - task: ArchiveFiles@2
@@ -64,29 +87,6 @@ steps:
     inputs:
       targetPath: '$(Build.ArtifactStagingDirectory)'
 
-  - task: PowerShell@2
-    displayName: 'Increment patch version after successful packaging'
-    inputs:
-      targetType: 'inline'
-      script: |
-        # Configure git for the build agent
-        git config --global user.email "[email protected]"
-        git config --global user.name "Azure DevOps Build Agent"
-
-        # Get current version for display
-        $currentVersion = & "$(Build.SourcesDirectory)/scripts/Get-Version.ps1" -BuildPropsPath "$(Build.SourcesDirectory)/Directory.Build.props" -Format Simple
-        Write-Host "Packaging completed successfully. Current version: $currentVersion"
-
-        # Increment patch version
-        & "$(Build.SourcesDirectory)/scripts/Increment-Version.ps1" -BuildPropsPath "$(Build.SourcesDirectory)/Directory.Build.props" -IncrementType Patch
-
-        # Get new version
-        $newVersion = & "$(Build.SourcesDirectory)/scripts/Get-Version.ps1" -BuildPropsPath "$(Build.SourcesDirectory)/Directory.Build.props" -Format Simple
-        Write-Host "New version: $newVersion"
-
-        # Set pipeline variable for later use
-        Write-Host "##vso[task.setvariable variable=NewVersion]$newVersion"
-
   - task: PowerShell@2
     displayName: 'Commit version update and create tag'
     inputs: