diff --git a/PepperDashEssentials/PepperDashEssentials.csproj b/PepperDashEssentials/PepperDashEssentials.csproj index 57594192..ae31ff6e 100644 --- a/PepperDashEssentials/PepperDashEssentials.csproj +++ b/PepperDashEssentials/PepperDashEssentials.csproj @@ -231,9 +231,15 @@ - - - + + Always + + + Always + + + Always + diff --git a/PepperDashEssentials/Properties/AssemblyInfo.cs b/PepperDashEssentials/Properties/AssemblyInfo.cs index 652ec978..83beada4 100644 --- a/PepperDashEssentials/Properties/AssemblyInfo.cs +++ b/PepperDashEssentials/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ [assembly: AssemblyCompany("PepperDash Technology Corp")] [assembly: AssemblyProduct("PepperDashEssentials")] [assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2018")] -[assembly: AssemblyVersion("1.4.12.*")] +[assembly: AssemblyVersion("1.4.0.*")] diff --git a/PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1 b/PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1 new file mode 100644 index 00000000..64d18786 --- /dev/null +++ b/PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1 @@ -0,0 +1,48 @@ +#Set-ExecutionPolicy RemoteSigned +function Usage +{ +echo "This is "; +echo “Usage: “; +echo ” from cmd.exe: “; +echo ” powershell.exe SetVersion.ps1 2.8.3.0″; +echo ” “; +echo ” from powershell.exe prompt: “; +echo ” .\SetVersion.ps1 2.8.3.0″; +echo ” “; +} + +function Update-SourceVersion +{ + Param ([string]$Version) + $NewVersion = ‘AssemblyVersion("‘ + $Version + ‘.*")’; + foreach ($o in $input) + { + Write-output $o.FullName + $TmpFile = $o.FullName + “.tmp” + get-content $o.FullName | + %{$_ -replace ‘AssemblyVersion\("(\d+\.\d+\.\d+)\.\*"\)’, $NewVersion } > $TmpFile + move-item $TmpFile $o.FullName -force + } +} + +function Update-AllAssemblyInfoFiles ( $version ) +{ + foreach ($file in “AssemblyInfo.cs”, “AssemblyInfo.vb” ) + { + get-childitem -recurse |? {$_.Name -eq $file} | Update-SourceVersion $version ; + } +} + +# validate arguments +$r= [System.Text.RegularExpressions.Regex]::Match($args[0], "^\d+\.\d+\.\d+$"); + if ($r.Success) + { + Update-AllAssemblyInfoFiles $args[0]; + } + else + { + echo ” “; + echo “Bad Input!” + echo ” “; + Usage ; +} diff --git a/README.md b/README.md index bedf0595..377a7131 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,13 @@ # Pepperdash Essentials +## RELEASE PROCESS CONTROLLED BY JENKINS CI PROCESS + #### How to merge -## Essentials Framework - -- If any external references have changed (like PepperDash.Core), make not of them in the commit in Framework - - Make changes - Build - Test on your system -- Commit and push to framework - Commit and push to essentials - Curse a whole lot when you try to figure out how to then get developments all synced up diff --git a/essentials-framework/Essentials DM/Essentials_DM/Essentials_DM.csproj b/essentials-framework/Essentials DM/Essentials_DM/Essentials_DM.csproj index e6dad5cb..3e4283e5 100644 --- a/essentials-framework/Essentials DM/Essentials_DM/Essentials_DM.csproj +++ b/essentials-framework/Essentials DM/Essentials_DM/Essentials_DM.csproj @@ -56,7 +56,7 @@ False - ..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll + ..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll