Improve existing scripts, add PSES update script

Author: rjmholt

tools/FileUpdateTools.psm1

@@ -185,4 +185,61 @@ function SetFileContent
 
     $FilePath = $PSCmdlet.GetUnresolvedProviderPathFromPSPath($FilePath)
     [System.IO.File]::WriteAllText($FilePath, $Value, $Encoding)
-}
+}
+
+function IncrementVersion
+{
+    param(
+        [Parameter(Mandatory)]
+        [semver]
+        $CurrentVersion,
+
+        [Parameter(Mandatory)]
+        [ValidateSet('Major', 'Minor', 'Patch', 'Preview')]
+        [string]
+        $IncrementLevel
+    )
+
+    switch ($IncrementLevel)
+    {
+        'Major'
+        {
+            return [semver]::new($version.Major+1, $version.Minor, $version.Patch, $version.PreReleaseLabel)
+        }
+
+        'Minor'
+        {
+            return [semver]::new($version.Major, $version.Minor+1, $version.Patch, $version.PreReleaseLabel)
+        }
+
+        'Patch'
+        {
+            return [semver]::new($version.Major, $version.Minor, $version.Patch+1, $version.PreReleaseLabel)
+        }
+
+        'Preview'
+        {
+            $newPreviewNumber = [int]$version.PreReleaseLabel.Substring(8) + 1
+            return [semver]::new($version.Major, $version.Minor, $version.Patch, "preview.$newPreviewNumber")
+        }
+    }
+}
+
+function GetVersionFromSemVer
+{
+    [OutputType([version])]
+    param(
+        [Parameter(Mandatory)]
+        [semver]
+        $SemVer
+    )
+
+    $svStr = $SemVer.ToString()
+
+    if (-not $SemVer.PreReleaseLabel)
+    {
+        return [version]$svStr
+    }
+
+    return $svStr.Substring(0, $svStr.IndexOf('-'))
+}

tools/GitHubTools.psm1

@@ -61,7 +61,6 @@ function CloneRepo
         if ($remote['upstream'])
         {
             git pull upstream $CloneBranch
-            git push --force-with-lease $OriginRemote $CloneBranch
         }
 
         if ($CheckoutBranch)

tools/repoUpdateScripts/updateAzureDataStudio.ps1

@@ -16,7 +16,15 @@ param(
 
     [Parameter()]
     [string]
-    $TargetFork = 'Microsoft'
+    $TargetFork = 'Microsoft',
+
+    [Parameter()]
+    [string]
+    $BranchName,
+
+    [Parameter()]
+    [string]
+    $PRDescription
 )
 
 Import-Module "$PSScriptRoot/../GitHubTools.psm1" -Force
@@ -226,7 +234,16 @@ function UpdateGalleryFile
 }
 
 $repoLocation = Join-Path ([System.IO.Path]::GetTempPath()) 'ads-temp-checkout'
-$branchName = "update-psext-$ExtensionVersion"
+
+if (-not $BranchName)
+{
+    $BranchName = "update-psext-$ExtensionVersion"
+}
+
+if (-not $PRDescription)
+{
+    $PRDescription = "Updates the version of the PowerShell extension in ADS to $ExtensionVersion.`n**Note**: This is an automated PR."
+}
 
 $cloneParams = @{
     OriginRemote = 'https://github.com/rjmholt/AzureDataStudio'
@@ -250,7 +267,7 @@ $prParams = @{
     TargetBranch = 'release/extensions'
     Branch = $branchName
     Title = "Update PowerShell extension to v$ExtensionVersion"
-    Description = "Updates the version of the PowerShell extension in ADS to $ExtensionVersion.`n**Note**: This is an automated PR."
+    Description = $PRDescription
     GitHubToken = $GitHubToken
     FromOrg = 'rjmholt'
 }

tools/repoUpdateScripts/updateExtensionVersions.ps1

@@ -18,7 +18,15 @@ param(
 
     [Parameter()]
     [string]
-    $TargetFork = 'PowerShell'
+    $TargetFork = 'PowerShell',
+
+    [Parameter()]
+    [string]
+    $BranchName,
+
+    [Parameter()]
+    [string]
+    $PRDescription
 )
 
 Import-Module -Force "$PSScriptRoot/../FileUpdateTools.psm1"
@@ -138,42 +146,6 @@ function FindVstsBuildVersionSpan
     }
 }
 
-function IncrementVersion
-{
-    param(
-        [Parameter(Mandatory)]
-        [semver]
-        $CurrentVersion,
-
-        [Parameter(Mandatory)]
-        $IncrementLevel
-    )
-
-    switch ($IncrementLevel)
-    {
-        'Major'
-        {
-            return [semver]::new($version.Major+1, $version.Minor, $version.Patch, $version.PreReleaseLabel)
-        }
-
-        'Minor'
-        {
-            return [semver]::new($version.Major, $version.Minor+1, $version.Patch, $version.PreReleaseLabel)
-        }
-
-        'Patch'
-        {
-            return [semver]::new($version.Major, $version.Minor, $version.Patch+1, $version.PreReleaseLabel)
-        }
-
-        'Preview'
-        {
-            $newPreviewNumber = [int]$version.PreReleaseLabel.Substring(8) + 1
-            return [semver]::new($version.Major, $version.Minor, $version.Patch, "preview.$newPreviewNumber")
-        }
-    }
-}
-
 function UpdateMainTsPsesVersion
 {
     param(
@@ -213,6 +185,23 @@ function UpdateDockerFileVersion
     SetFileContent -FilePath $DockerFilePath -Value $newDockerFileContent
 }
 
+function GetMarketplaceVersionFromSemVer
+{
+    [OutputType([version])]
+    param(
+        [Parameter(Mandatory)]
+        [semver]
+        $SemVer
+    )
+
+    if (-not $SemVer.PreReleaseLabel)
+    {
+        return [version]($SemVer.ToString())
+    }
+
+    return [version]::new($NewVersion.Major, $NewVersion.Minor, $NewVersion.PreReleaseLabel.Substring(8)-1)
+}
+
 # Define locations/branch name
 $repoLocation = Join-Path ([System.IO.Path]::GetTempPath()) 'vscps-updateversion-temp'
 $paths = @{
@@ -245,19 +234,19 @@ if ($IncrementLevel)
 
 # Get the marketplace/non-semver versions for various files
 $newVersionStr = $NewVersion.ToString()
-if ($NewVersion.PreReleaseLabel)
+$psesVersion = GetVersionFromSemVer -SemVer $NewVersion
+$marketPlaceVersion = GetMarketplaceVersionFromSemVer -SemVer $NewVersion
+
+if (-not $BranchName)
 {
-    $psesVersion = $newVersionStr.Substring(0, $newVersionStr.IndexOf('-'))
-    $marketPlaceVersion = [version]::new($NewVersion.Major, $NewVersion.Minor, $NewVersion.PreReleaseLabel.Substring(8)-1)
+    $BranchName = "update-version-$newVersionStr"
 }
-else
+
+if (-not $PRDescription)
 {
-    $psesVersion = $newVersionStr
-    $marketPlaceVersion = $newVersionStr
+    $PRDescription = "Updates version strings in vscode-PowerShell to $newVersionStr.`n**Note**: This is an automated PR."
 }
 
-$branchName = "update-version-$newVersionStr"
-
 # Finally create the new package.json file
 $newPkgJsonContent = ReplaceStringSegment -String $packageJson -NewSegment $newVersionStr -StartIndex $pkgJsonVersionOffsetSpan.Start -EndIndex $pkgJsonVersionOffsetSpan.End
 SetFileContent -FilePath $paths.packageJson -Value $newPkgJsonContent
@@ -287,7 +276,7 @@ $prParams = @{
     Repository = 'vscode-PowerShell'
     Branch = $branchName
     Title = "Update version to v$newVersionStr"
-    Description = "Updates version strings in vscode-PowerShell to $newVersionStr.`n**Note**: This is an automated PR."
+    Description = $PRDescription
     GitHubToken = $GitHubToken
     FromOrg = 'rjmholt'
 }