diff --git a/PostPublish.ps1 b/PostPublish.ps1 index d7a64f452..0efa37411 100644 --- a/PostPublish.ps1 +++ b/PostPublish.ps1 @@ -18,4 +18,4 @@ Minor = $versionInfo.ProductMinorPart Build = $versionInfo.ProductBuildPart Revision = $versionInfo.ProductPrivatePart } -$json | ConvertTo-Json > VersionInformation.json \ No newline at end of file +$json | ConvertTo-Json > ("{0}\VersionInformation.json" -f $PublishDir) \ No newline at end of file diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d732acb3d..8bb7b7f95 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -50,12 +50,6 @@ steps: zipAfterPublish: false modifyOutputPath: false -- task: oneLuckiDevJson2Variable@1 - inputs: - jsonFile: '$(build.artifactStagingDirectory)\Application\VersionInformation.json' - shouldPrefixVariables: true - variablePrefix: 'VersionInformation' - - task: PowerShell@2 inputs: targetType: 'inline' @@ -63,6 +57,19 @@ steps: failOnStderr: true workingDirectory: '$(Build.Repository.LocalPath)\Application\BuildScripts' +- task: PowerShell@2 + inputs: + filePath: 'PostPublish.ps1' + arguments: '$(outputFolder)' + failOnStderr: true + workingDirectory: '$(Build.Repository.LocalPath)' + +- task: oneLuckiDevJson2Variable@1 + inputs: + jsonFile: '$(build.artifactStagingDirectory)\VersionInformation.json' + shouldPrefixVariables: true + variablePrefix: 'VersionInformation' + - task: BatchScript@1 inputs: filename: 'Application\BuildScripts\PostPublish.bat' @@ -70,12 +77,6 @@ steps: arguments: '$(outputFolder)' failOnStandardError: true -- task: PowerShell@2 - inputs: - filePath: 'PostPublish.ps1' - arguments: '$(outputFolder)' - failOnStderr: true - workingDirectory: '$(Build.Repository.LocalPath)' - task: CmdLine@2 inputs: