Merge pull request #25 from jwittner/dev/developPrereleaseBuilds

Configuration and changes to support develop prerelase builds

Author: jwittner

UnitySetup/UnitySetup.psd1

@@ -5,7 +5,7 @@
 #
 # Generated by: Josh Wittner
 #
-# Generated on: 2017-08-04
+# Generated on: 2018-01-31
 #
 
 @{
@@ -119,6 +119,12 @@ PrivateData = @{
         # ReleaseNotes of this module
         # ReleaseNotes = ''
 
+        # Prerelease string of this module
+        # Prerelease = ''
+
+        # Flag to indicate whether the module requires explicit user acceptance for install/update
+        # RequireLicenseAcceptance = $false
+
         # External dependent modules of this module
         # ExternalModuleDependencies = @()
 

appveyor.yml

@@ -4,15 +4,28 @@ pull_requests:
 branches:
   only:
   - master
+  - develop
 environment:
   NugetAPIKey:
     secure: zvkaZiaBXVko+3ZzuSb7W6DTUJmHX98XgEhKs28SnGD+4TM3gzhPxVnNWSmBhXEx
 install:
 - ps: >-
-    Install-PackageProvider -Name NuGet -Force | Out-Null
+    Install-PackageProvider -Name NuGet -Force
 
-    Install-Module 'powershell-yaml' -Scope CurrentUser -Force -AllowClobber
+    Remove-Module 'PowerShellGet' -Force -ErrorAction SilentlyContinue -Verbose
+
+    Install-Module 'PowerShellGet' -Scope CurrentUser -Force -AllowClobber -Verbose
+
+    Install-Module 'powershell-yaml' -Scope CurrentUser -Force -AllowClobber -Verbose
 build_script:
-- ps: .\build.ps1 -Revision "$env:APPVEYOR_BUILD_NUMBER"
+- ps: .\build.ps1 -Revision "$env:APPVEYOR_BUILD_NUMBER" -Suffix "$env:APPVEYOR_REPO_BRANCH"
 deploy_script:
-- ps: Publish-Module -Path .\UnitySetup -NugetAPIKey $env:NugetAPIKey
+- ps: Publish-Module -Path .\UnitySetup -NugetAPIKey $env:NugetAPIKey
+for:
+-
+  branches:
+    only:
+    - master
+  build_script:
+  - ps: .\build.ps1 -Revision "$env:APPVEYOR_BUILD_NUMBER"
+

build.ps1

@@ -1,7 +1,21 @@
-param([int]$Revision = 0)
-$currentVersion = Test-ModuleManifest -ErrorAction Stop .\UnitySetup\UnitySetup.psd1 | Select-Object -ExpandProperty Version
-Write-Host "Current Module Version: $currentVersion"
-$newVersion = New-Object System.Version($currentVersion.Major, $currentVersion.Minor, $Revision)
+param([int]$Revision = 0, [string]$Suffix = '')
+Import-Module 'PowerShellGet' -Force
 
-Write-Host "New Module Version:$newVersion"
-Update-ModuleManifest -ErrorAction Stop -ModuleVersion $newVersion -Path .\UnitySetup\UnitySetup.psd1
+$ErrorActionPreference = 'Stop'
+
+$manifest = Test-ModuleManifest .\UnitySetup\UnitySetup.psd1
+$versionString =  $manifest.Version.ToString()
+if($manifest.PrivateData['PSData']['Prerelease']) { 
+    $versionString += "-$($manifest.PrivateData['PSData']['Prerelease'])"
+}
+Write-Host "Current Module Version: $versionString"
+
+$newVersion = New-Object System.Version($manifest.Version.Major, $manifest.Version.Minor, $Revision)
+Update-ModuleManifest -ModuleVersion $newVersion -Prerelease $Suffix -Path .\UnitySetup\UnitySetup.psd1
+
+$manifest = Test-ModuleManifest .\UnitySetup\UnitySetup.psd1
+$versionString =  $manifest.Version.ToString()
+if($manifest.PrivateData['PSData']['Prerelease']) { 
+    $versionString += "-$($manifest.PrivateData['PSData']['Prerelease'])"
+}
+Write-Host "New Module Version: $versionString"