Simplify version bump script with stash push/pop

Author: angularsen

Build/set-version-UnitsNet.ps1

@@ -56,11 +56,13 @@ $numberExtensionsProjFile = "$root\UnitsNet.NumberExtensions\UnitsNet.NumberExte
 $nanoFrameworkNuspecGeneratorFile = "$root\CodeGen\Generators\NanoFrameworkGen\NuspecGenerator.cs"
 $winrtAssemblyInfoFile = "$root\UnitsNet.WindowsRuntimeComponent\Properties\AssemblyInfo.cs"
 $winrtNuspecFile = "$root\UnitsNet.WindowsRuntimeComponent\UnitsNet.WindowsRuntimeComponent.nuspec"
-$versionFiles = @($projFile, $numberExtensionsProjFile, $winrtAssemblyInfoFile, $winrtNuspecFile)
 
 # Use UnitsNet.Common.props version as base if bumping major/minor/patch
 $newVersion = Get-NewProjectVersion $projFile $paramSet $setVersion $bumpVersion
 
+# Reset and stash any other local changes.
+Invoke-StashPush
+
 # Update project files
 Set-ProjectVersion $projFile $newVersion
 Set-ProjectVersion $numberExtensionsProjFile $newVersion
@@ -73,6 +75,9 @@ Set-NuspecVersion $winrtNuspecFile $newVersion
 Set-NuspecVersion $nanoFrameworkNuspecGeneratorFile $newVersion
 
 # Git commit and tag
-Invoke-CommitVersionBump @("UnitsNet") $versionFiles $newVersion
+Invoke-CommitVersionBump @("UnitsNet") $newVersion
 Invoke-TagVersionBump "UnitsNet" $newVersion
 Invoke-TagVersionBump "UnitsNet.NumberExtensions" $newVersion
+
+# Restore any local changes.
+Invoke-StashPop

Build/set-version.psm1

@@ -16,23 +16,22 @@ function Get-NewProjectVersion(
   }
 }
 
+function Invoke-StashPush() {
+  git reset --quiet
+  git stash --include-untracked --message "Before version bump" --quiet
+}
+
+function Invoke-StashPop() {
+  git stash pop --quiet
+}
+
 function Invoke-CommitVersionBump(
   [string[]]$projectNames,
-  [string[]]$projectPaths,
   [string] $newSemVer) {
   try {
-    Write-Host -Foreground Green Resetting git index.
-    git reset
-
-    ForEach ($path in $projectPaths) {
-      $path = Resolve-Path $path
-      Write-Host -Foreground Green "Staging file: $path"
-      git add $path
-    }
-
     $projectNamesConcat = [string]::Join(", ", $projectNames)
     Write-Host -Foreground Green "Committing new version: $newSemVer"
-    git commit -m "${projectNamesConcat}: $newSemVer"
+    git commit -a -m "${projectNamesConcat}: $newSemVer"
   }
   catch {
     $err = $PSItem.Exception
@@ -159,4 +158,11 @@ function Resolve-Error ($ErrorRecord=$Error[0])
   }
 }
 
-export-modulemember -function Get-NewProjectVersion, Invoke-CommitVersionBump, Invoke-TagVersionBump, Set-ProjectVersion, Set-AssemblyInfoVersion, Set-NuspecVersion
+export-modulemember -function Get-NewProjectVersion,
+  Invoke-CommitVersionBump,
+  Invoke-TagVersionBump,
+  Set-ProjectVersion,
+  Set-AssemblyInfoVersion,
+  Set-NuspecVersion,
+  Invoke-StashPush,
+  Invoke-StashPop