From f1d1affb8c12bc8ec9857beff41effa3bb00ff2d Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Sat, 20 Mar 2021 18:13:13 +0000 Subject: [PATCH 01/12] fix exe upload --- tools/releaseBuild/azureDevOps/templates/upload.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/releaseBuild/azureDevOps/templates/upload.yml b/tools/releaseBuild/azureDevOps/templates/upload.yml index 580ee279e89..47691586717 100644 --- a/tools/releaseBuild/azureDevOps/templates/upload.yml +++ b/tools/releaseBuild/azureDevOps/templates/upload.yml @@ -59,7 +59,7 @@ steps: - task: AzureFileCopy@4 displayName: 'upload signed exe to Azure - ${{ parameters.architecture }}' inputs: - SourcePath: '$(System.ArtifactsDirectory)\signed\PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}.exe' + SourcePath: '$(System.ArtifactsDirectory)\signedPackages\PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}.exe' azureSubscription: '$(AzureFileCopySubscription)' Destination: AzureBlob storage: '$(StorageAccount)' From 6c46aeede57e860292c8da48f862bdad7cbac325 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Sat, 20 Mar 2021 19:09:57 +0000 Subject: [PATCH 02/12] Update how file version is created to patch previe --- PowerShell.Common.props | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/PowerShell.Common.props b/PowerShell.Common.props index 73110a79695..da17092ae39 100644 --- a/PowerShell.Common.props +++ b/PowerShell.Common.props @@ -23,11 +23,44 @@ + + + + ^((\d+).(\d+).(\d+))(-(\w+)(.(\d+))?)?$ + $([System.Text.RegularExpressions.Regex]::Match($(ReleaseTag), $(RegexReleaseTag)).Groups[1].Value) + $([System.Text.RegularExpressions.Regex]::Match($(ReleaseTag), $(RegexReleaseTag)).Groups[8].Value) + $([System.Text.RegularExpressions.Regex]::Match($(ReleaseTag), $(RegexReleaseTag)).Groups[6].Value) + + 100 + $([MSBuild]::Add($(ReleaseTagSemVersionPart), $(RCIncrementValue))) + $(ReleaseTag) + + $(ReleaseTagVersionPart).$(ReleaseTagSemVersionPart) + + $(ReleaseTagVersionPart) ^v(.+)-(\d+)-g(.+) + $([System.Text.RegularExpressions.Regex]::Match($(PowerShellVersion), $(RegexGitVersion)).Groups[1].Value) $([System.Text.RegularExpressions.Regex]::Match($(PowerShellVersion), $(RegexGitVersion)).Groups[1].Value) $([System.Text.RegularExpressions.Regex]::Match($(PowerShellVersion), $(RegexGitVersion)).Groups[2].Value) $([System.Text.RegularExpressions.Regex]::Match($(PowerShellVersion), $(RegexGitVersion)).Groups[3].Value) @@ -52,7 +85,7 @@ Here we define explicitly 'Version' to set 'FileVersion' and 'AssemblyVersion' by 'GetAssemblyVersion' target in 'Microsoft.NET.GenerateAssemblyInfo.targets'. Here we define explicitly 'InformationalVersion' because by default it is defined as 'Version' by 'GetAssemblyVersion' target in 'Microsoft.NET.GenerateAssemblyInfo.targets'. --> - $(PSCoreBuildVersion) + $(PSCoreFileVersion) $(PSCoreFormattedVersion) $(PSCoreFormattedVersion) @@ -74,6 +107,9 @@ Lines="ReleaseTag=$(ReleaseTag); PowerShellVersion=$(PowerShellVersion); PSCoreBuildVersion = $(PSCoreBuildVersion); + PSCoreFileVersion = $(PSCoreFileVersion); + ReleaseTagVersionPart=$(ReleaseTagVersionPart); + ReleaseTagSemVersionPart=$(ReleaseTagSemVersionPart); PSCoreAdditionalCommits = $(PSCoreAdditionalCommits); PSCoreCommitSHA = $(PSCoreCommitSHA); PSCoreMajorVersion = $(PSCoreMajorVersion); From 446e067fd10320cea6cdf7a32e627cadc793a512 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Sat, 20 Mar 2021 19:24:11 +0000 Subject: [PATCH 03/12] fix artifact upload --- tools/releaseBuild/azureDevOps/templates/upload.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/releaseBuild/azureDevOps/templates/upload.yml b/tools/releaseBuild/azureDevOps/templates/upload.yml index 47691586717..b1d75ad7f99 100644 --- a/tools/releaseBuild/azureDevOps/templates/upload.yml +++ b/tools/releaseBuild/azureDevOps/templates/upload.yml @@ -52,7 +52,7 @@ steps: - template: upload-final-results.yml parameters: - artifactPath: $(System.ArtifactsDirectory)\signed + artifactPath: $(System.ArtifactsDirectory)\signedPackages artifactFilter: PowerShell-${{ parameters.version }}-win-${{ parameters.architecture }}.exe condition: and(succeeded(), eq('${{ parameters.msi }}', 'yes')) From 8298404c82b5409ce6ed49197e3beeeb8fcbd584 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Sun, 21 Mar 2021 17:58:43 +0000 Subject: [PATCH 04/12] fix prerelease iteration --- tools/ci.psm1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/ci.psm1 b/tools/ci.psm1 index 656ba8723e6..af42d6fd330 100644 --- a/tools/ci.psm1 +++ b/tools/ci.psm1 @@ -462,7 +462,8 @@ function Invoke-CIFinish $previewLabel= "daily{0}" -f $previewLabel } - $preReleaseVersion = "$previewPrefix-$previewLabel.$env:BUILD_BUILDID" + $prereleaseIteration = (Get-Random -Minimum 1 -Maximum 99) + $preReleaseVersion = "$previewPrefix-$previewLabel.$prereleaseIteration" # Build clean before backing to remove files from testing Start-PSBuild -CrossGen -PSModuleRestore -Configuration 'Release' -ReleaseTag $preReleaseVersion -Clean -Runtime $Runtime } From 2649757417363e8a0de4fa880edec5fbf82d373c Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Sun, 21 Mar 2021 18:00:14 +0000 Subject: [PATCH 05/12] fix comment --- tools/ci.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci.psm1 b/tools/ci.psm1 index af42d6fd330..fbdafa43c19 100644 --- a/tools/ci.psm1 +++ b/tools/ci.psm1 @@ -475,7 +475,7 @@ function Invoke-CIFinish Start-PSBuild -CrossGen -PSModuleRestore -Configuration 'Release' -ReleaseTag $preReleaseVersion -Clean -Runtime $Runtime } - # Build packages $preReleaseVersion = "$previewPrefix-$previewLabel.$env:BUILD_BUILDID" + # Build packages $preReleaseVersion = "$previewPrefix-$previewLabel.$prereleaseIteration" $packages = Start-PSPackage -Type msi,nupkg,zip,zip-pdb -ReleaseTag $preReleaseVersion -SkipReleaseChecks -WindowsRuntime $Runtime $artifacts = New-Object System.Collections.ArrayList From 7935e81d4e42187c9d71febd2c98c1f760fb1cb1 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Mon, 22 Mar 2021 11:11:22 -0700 Subject: [PATCH 06/12] Update PowerShell.Common.props Co-authored-by: Robert Holt --- PowerShell.Common.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PowerShell.Common.props b/PowerShell.Common.props index da17092ae39..e20c894466d 100644 --- a/PowerShell.Common.props +++ b/PowerShell.Common.props @@ -30,11 +30,11 @@ __a__.__b____.c a = Version part and is group 1 of the regex - b = the Semantic version pre release name. This is optional. - c = The semantic version pre release iteration. This is optional and only allowed of the pre-release name is present. + b = the Semantic version prerelease name. This is optional. + c = The semantic version prerelease iteration. This is optional and only allowed of the prerelease name is present. - Our version will become the version part with the pre-release iteration being the revision (the 4th part of the version). - For RCs, we will increment the iteration 100. + Our version will become the version part with the prerelease iteration being the revision (the 4th part of the version). + For RCs, we will increment the iteration from 100. Examples 7.2.0 becomes 7.2.0 From 023cddec2434a5d4c2c20d5b433e11f305da6da0 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Mon, 22 Mar 2021 18:32:29 +0000 Subject: [PATCH 07/12] use day of monh for pre-release iteration --- tools/ci.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci.psm1 b/tools/ci.psm1 index fbdafa43c19..41e972b9bcf 100644 --- a/tools/ci.psm1 +++ b/tools/ci.psm1 @@ -462,7 +462,7 @@ function Invoke-CIFinish $previewLabel= "daily{0}" -f $previewLabel } - $prereleaseIteration = (Get-Random -Minimum 1 -Maximum 99) + $prereleaseIteration = (get-date).Day $preReleaseVersion = "$previewPrefix-$previewLabel.$prereleaseIteration" # Build clean before backing to remove files from testing Start-PSBuild -CrossGen -PSModuleRestore -Configuration 'Release' -ReleaseTag $preReleaseVersion -Clean -Runtime $Runtime From 060814e4c57043228558d6924910f30191b21046 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Mon, 22 Mar 2021 18:36:49 +0000 Subject: [PATCH 08/12] fix spacing --- PowerShell.Common.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PowerShell.Common.props b/PowerShell.Common.props index e20c894466d..38cd13e007d 100644 --- a/PowerShell.Common.props +++ b/PowerShell.Common.props @@ -105,11 +105,11 @@