round 2 of version injection

This commit is contained in:
RaidMax 2020-01-15 14:06:29 -06:00
parent 1c287ee354
commit a078da2715

View File

@ -39,12 +39,11 @@ steps:
- task: projectversionasvariable@1 - task: projectversionasvariable@1
inputs: inputs:
path: '$(Build.Repository.LocalPath)\Application\Application.csproj' path: '$(Build.Repository.LocalPath)\Application\Application.csproj'
prefix: 'VersionInfo'
- task: VSBuild@1 - task: VSBuild@1
inputs: inputs:
solution: '$(solution)' solution: '$(solution)'
msbuildArgs: '/p:DeployOnBuild=false /p:PackageAsSingleFile=false /p:SkipInvalidConfigurations=true /p:PackageLocation="$(build.artifactStagingDirectory)" /p:Version=$(VersionInformation.Major).$(VersionInformation.Minor).$(VersionInformation.Build).$(Build.BuildId)' msbuildArgs: '/p:DeployOnBuild=false /p:PackageAsSingleFile=false /p:SkipInvalidConfigurations=true /p:PackageLocation="$(build.artifactStagingDirectory)" /p:Version=$(Version.Major).$(Version.Minor).$(Version.Build).$(Build.BuildId)'
platform: '$(buildPlatform)' platform: '$(buildPlatform)'
configuration: '$(buildConfiguration)' configuration: '$(buildConfiguration)'
@ -55,7 +54,7 @@ steps:
projects: | projects: |
**/WebfrontCore.csproj **/WebfrontCore.csproj
**/Application.csproj **/Application.csproj
arguments: '-c $(buildConfiguration) -o $(outputFolder) /p:Version=$(VersionInformation.Major).$(VersionInformation.Minor).$(VersionInformation.Build).$(Build.BuildId)' arguments: '-c $(buildConfiguration) -o $(outputFolder) /p:Version=$(Version.Major).$(Version.Minor).$(Version.Build).$(Build.BuildId)'
zipAfterPublish: false zipAfterPublish: false
modifyOutputPath: false modifyOutputPath: false
@ -116,7 +115,7 @@ steps:
rootFolderOrFile: '$(outputFolder)' rootFolderOrFile: '$(outputFolder)'
includeRootFolder: false includeRootFolder: false
archiveType: 'zip' archiveType: 'zip'
archiveFile: '$(Build.ArtifactStagingDirectory)/IW4MAdmin-$(VersionInformation.Major).$(VersionInformation.Minor)-$(buildConfiguration)$(VersionInformation.Build)b$(Build.BuildId).zip' archiveFile: '$(Build.ArtifactStagingDirectory)/IW4MAdmin-$(Version.Major).$(Version.Minor)-$(buildConfiguration)$(Version.Build)b$(Build.BuildId).zip'
replaceExistingArchive: true replaceExistingArchive: true
- task: FtpUpload@2 - task: FtpUpload@2
@ -140,8 +139,8 @@ steps:
# action: 'create' # action: 'create'
# target: '$(Build.SourceVersion)' # target: '$(Build.SourceVersion)'
# tagSource: 'userSpecifiedTag' # tagSource: 'userSpecifiedTag'
# tag: '$(VersionInformation.Major).$(VersionInformation.Minor)-$(buildConfiguration)$(VersionInformation.Build)b$(Build.BuildId)' # tag: '$(Version.Major).$(Version.Minor)-$(buildConfiguration)$(Version.Build)b$(Build.BuildId)'
# title: 'Version $(VersionInformation.Major).$(VersionInformation.Minor) $(buildConfiguration) Feature $(VersionInformation.Build) Build $(Build.BuildId)' # title: 'Version $(Version.Major).$(Version.Minor) $(buildConfiguration) Feature $(Version.Build) Build $(Build.BuildId)'
# assets: '$(Build.ArtifactStagingDirectory)/*.zip' # assets: '$(Build.ArtifactStagingDirectory)/*.zip'
# isPreRelease: true # isPreRelease: true
# releaseNotesSource: 'inline' # releaseNotesSource: 'inline'
@ -154,7 +153,7 @@ steps:
targetType: 'inline' targetType: 'inline'
script: | script: |
$payload = @{ $payload = @{
'current-version-prerelease' = '$(VersionInformation.Major).$(VersionInformation.Minor).$(VersionInformation.Build).$(Build.BuildId)' 'current-version-prerelease' = '$(Version.Major).$(Version.Minor).$(Version.Build).$(Build.BuildId)'
'jwt-secret' = '$(JWTSecret)' 'jwt-secret' = '$(JWTSecret)'
} | ConvertTo-Json } | ConvertTo-Json