Merged in testing/jenkinsCI-1 (pull request #20)

Testing/jenkinsCI-1

Approved-by: Neil Dorin <ndorin@pepperdash.com>

PepperDashEssentials/PepperDashEssentials.csproj

@@ -231,9 +231,15 @@
     <Compile Include="UI\SubpageReferenceListSourceItem.cs" />
     <None Include="app.config" />
     <None Include="Properties\ControlSystem.cfg" />
-    <EmbeddedResource Include="SGD\PepperDash Essentials iPad.sgd" />
+    <EmbeddedResource Include="SGD\PepperDash Essentials iPad.sgd">
-    <EmbeddedResource Include="SGD\PepperDash Essentials TSW-560.sgd" />
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    <EmbeddedResource Include="SGD\PepperDash Essentials TSW-760.sgd" />
+    </EmbeddedResource>
+    <EmbeddedResource Include="SGD\PepperDash Essentials TSW-560.sgd">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SGD\PepperDash Essentials TSW-760.sgd">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\essentials-framework\Essentials Core\PepperDashEssentialsBase\PepperDash_Essentials_Core.csproj">

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.*")]
 

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 ;
+}

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

essentials-framework/Essentials DM/Essentials_DM/Essentials_DM.csproj

@@ -56,7 +56,7 @@
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="PepperDash_Core, Version=1.0.4.20530, Culture=neutral, processorArchitecture=MSIL">