Merge branch 'master' into develop

Author: jacobjones

.gitignore

@@ -339,3 +339,6 @@ ASALocalRun/
 
 # BeatPulse healthcheck temp database 
 healthchecksdb
+
+# Ignore the zip generated when building the project
+/DoubleJay.Epi.ConfigurableColorPicker/DoubleJay.Epi.ConfigurableColorPicker.zip

.nuget/NuGet.targets

@@ -0,0 +1,7 @@
+## How to pack
+
+Open a terminal, CD to this directory and run the following command: 
+
+```
+dotnet pack
+```

.nuget/nuget.exe

@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.168
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32414.318
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DoubleJay.Epi.ConfigurableColorPicker", "DoubleJay.Epi.ConfigurableColorPicker\DoubleJay.Epi.ConfigurableColorPicker.csproj", "{BD378E34-49F8-44C4-A8BE-D01193F8AF6F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DoubleJay.Epi.ConfigurableColorPicker", "DoubleJay.Epi.ConfigurableColorPicker\DoubleJay.Epi.ConfigurableColorPicker.csproj", "{BD378E34-49F8-44C4-A8BE-D01193F8AF6F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Build-Package.ps1

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <ItemGroup>
+        <ClientResources Include="$(ProjectDir)ClientResources\**\*"/>
+    </ItemGroup>
+    <PropertyGroup>
+        <TmpOutDir>$([System.IO.Path]::Combine($(ProjectDir), 'tmp'))</TmpOutDir>
+    </PropertyGroup>
+    <ItemGroup>
+        <Content Include="$(MSBuildProjectName).zip">
+            <Pack>true</Pack>
+            <PackagePath>contentFiles\any\any\modules\_protected\$(MSBuildProjectName)</PackagePath>
+            <BuildAction>None</BuildAction>
+            <PackageCopyToOutput>true</PackageCopyToOutput>
+        </Content>
+        <Content Include="msbuild\CopyZipFiles.targets" >
+            <Pack>true</Pack>
+            <PackagePath>build\$(MSBuildProjectName).targets</PackagePath>
+        </Content>
+        <None Include="..\LICENSE" Pack="true" PackagePath=""/>
+    </ItemGroup>
+</Project>

CONTRIBUTING.md

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="CreateColorPickerZip" BeforeTargets="Build">
+    <Copy SourceFiles="$(ProjectDir)module.config" DestinationFolder="$(TmpOutDir)\content"/>
+    <Copy SourceFiles="@(ClientResources)" DestinationFiles="@(ClientResources -> '$(TmpOutDir)\content\$(PackageVersion)\ClientResources\%(RecursiveDir)%(Filename)%(Extension)')"/>
+
+    <!-- Update the module config with the version information -->
+    <XmlPoke XmlInputPath="$(TmpOutDir)\content\module.config" Query="/module/@clientResourceRelativePath" Value="$(PackageVersion)"/>
+  </Target>
+  <Target Name="ZipClientResources" BeforeTargets="Build" AfterTargets="CreateColorPickerZip" DependsOnTargets="CreateColorPickerZip">
+    <ZipDirectory SourceDirectory="$(TmpOutDir)\content" DestinationFile="$(ProjectDir)$(MSBuildProjectName).zip" Overwrite="true"/>
+  </Target>
+  <Target Name="CleanupTmpOutDir" BeforeTargets="Build" AfterTargets="ZipClientResources" DependsOnTargets="ZipClientResources">
+    <RemoveDir Directories="$(TmpOutDir)"/>
+  </Target>
+</Project>