From 8f564a82d4dd49fbde54b75226ba72005a91e429 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Wed, 10 Jul 2019 11:55:23 -0600 Subject: [PATCH 1/7] copies Crestron.SimplSharpPro.UI hint path from Essentials Core.csproj which works --- .../Essentials DM/Essentials_DM/Essentials_DM.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 6725266ad931669a0b7d231c585242f4da08c549 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Wed, 10 Jul 2019 12:01:11 -0600 Subject: [PATCH 2/7] Set SGD files to copy to output directory --- PepperDashEssentials/PepperDashEssentials.csproj | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) 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 + From 15c6da43eb99954c9a0ead22a2dd16131f62c602 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Thu, 11 Jul 2019 12:04:37 -0600 Subject: [PATCH 3/7] Adds PowerShell Script for updating assembly version number --- .../Properties/UpdateAssemblyVersion.ps1 | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1 diff --git a/PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1 b/PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1 new file mode 100644 index 00000000..e0838d7a --- /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 ; +} From fd2fe8fa6ee58d0740cd66f94c5ca5df8cc7dd51 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Thu, 11 Jul 2019 12:22:42 -0600 Subject: [PATCH 4/7] Comments out set-ExecutionPolicy RemoteSigned from script --- PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1 b/PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1 index e0838d7a..1beca878 100644 --- a/PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1 +++ b/PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1 @@ -1,4 +1,4 @@ -Set-ExecutionPolicy RemoteSigned +#Set-ExecutionPolicy RemoteSigned function Usage { echo "This is "; From aa2b5b9ab40dacf2249d8f10fdca20cc5478797d Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Thu, 11 Jul 2019 12:26:56 -0600 Subject: [PATCH 5/7] Fixes double quotes in script --- PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1 b/PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1 index 1beca878..64d18786 100644 --- a/PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1 +++ b/PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1 @@ -14,7 +14,7 @@ echo ” “; function Update-SourceVersion { Param ([string]$Version) - $NewVersion = ‘AssemblyVersion(“‘ + $Version + ‘.*”)’; + $NewVersion = ‘AssemblyVersion("‘ + $Version + ‘.*")’; foreach ($o in $input) { Write-output $o.FullName @@ -34,7 +34,7 @@ function Update-AllAssemblyInfoFiles ( $version ) } # validate arguments -$r= [System.Text.RegularExpressions.Regex]::Match($args[0], “^\d+\.\d+\.\d+$”); +$r= [System.Text.RegularExpressions.Regex]::Match($args[0], "^\d+\.\d+\.\d+$"); if ($r.Success) { Update-AllAssemblyInfoFiles $args[0]; From af1489d51142d7c5e21ee14281d11575d4eb48be Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Thu, 11 Jul 2019 16:35:36 -0600 Subject: [PATCH 6/7] reset revision number for assembly version to allow CI process to set it. --- PepperDashEssentials/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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.*")] From f8a6ef8c418314d83e59fec97cc27159af9234ab Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Thu, 11 Jul 2019 17:13:11 -0600 Subject: [PATCH 7/7] Updated readme --- README.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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