From f0617f21166d5a80720db85d813ae84aa152db5c Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 20 Aug 2020 10:31:17 -0600
Subject: [PATCH 01/11] update submodule to 1.6.1

---
 EssentialsBuilds | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EssentialsBuilds b/EssentialsBuilds
index 855dccd..e29501b 160000
--- a/EssentialsBuilds
+++ b/EssentialsBuilds
@@ -1 +1 @@
-Subproject commit 855dccd0d41aac272512f58d6bcd4764307bbb14
+Subproject commit e29501be5df2c587d1b6221e60565e38d21e369d

From 05ba06661c5bfc636756f0512df8d46780a6fa8b Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 20 Aug 2020 10:31:33 -0600
Subject: [PATCH 02/11] Update Join map and bridging methods

---
 .../EssentialsPluginTemplateBridge.cs         | 57 -------------------
 .../EssentialsPluginTemplateJoinMap.cs        | 27 +++++++++
 2 files changed, 27 insertions(+), 57 deletions(-)
 delete mode 100644 PDT.EssentialsPluginTemplate.EPI/EssentialsPluginTemplateBridge.cs
 create mode 100644 PDT.EssentialsPluginTemplate.EPI/EssentialsPluginTemplateJoinMap.cs

diff --git a/PDT.EssentialsPluginTemplate.EPI/EssentialsPluginTemplateBridge.cs b/PDT.EssentialsPluginTemplate.EPI/EssentialsPluginTemplateBridge.cs
deleted file mode 100644
index e26e2d7..0000000
--- a/PDT.EssentialsPluginTemplate.EPI/EssentialsPluginTemplateBridge.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Bridges;
-
-using Newtonsoft.Json;
-
-namespace EssentialsPluginTemplateEPI
-{
-	public static class EssentialsPluginTemplateBridge
-	{
-		public static void LinkToApiExt(this EssentialsPluginFactory DspDevice, BasicTriList trilist, uint joinStart, string joinMapKey)
-		{
-            // Construct the default join map
-            EssentialsPluginTemplateBridgeJoinMap joinMap = new EssentialsPluginTemplateBridgeJoinMap();
-
-            // Attempt to get a custom join map if specified in config
-            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
-
-            // If we find a custom join map, deserialize it
-            if (!string.IsNullOrEmpty(joinMapSerialized))
-                joinMap = JsonConvert.DeserializeObject<EssentialsPluginTemplateBridgeJoinMap>(joinMapSerialized);
-
-            // Offset the joins based on the join start
-            joinMap.OffsetJoinNumbers(joinStart);
-
-
-            // Set all your join actions here
-
-
-            // Link all your feedbacks to joins here
-
-		}
-	}
-	public class EssentialsPluginTemplateBridgeJoinMap : JoinMapBase
-	{
-        // Specify your joins here
-
-
-		public EssentialsPluginTemplateBridgeJoinMap()
-		{
-            // Set the values of your joins here
-		}
-
-		public override void OffsetJoinNumbers(uint joinStart)
-		{
-            // Offset the joins from joinStart as applicable
-		}
-	}
-}
\ No newline at end of file
diff --git a/PDT.EssentialsPluginTemplate.EPI/EssentialsPluginTemplateJoinMap.cs b/PDT.EssentialsPluginTemplate.EPI/EssentialsPluginTemplateJoinMap.cs
new file mode 100644
index 0000000..4272a97
--- /dev/null
+++ b/PDT.EssentialsPluginTemplate.EPI/EssentialsPluginTemplateJoinMap.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
+
+namespace PDT.EssentialsPluginTemplate.EPI
+{
+    public class EssentialsPluginTemplateBridgeJoinMap : JoinMapBaseAdvanced
+    {
+        [JoinName("IsOnline")]
+        public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData {JoinNumber = 1, JoinSpan = 1},
+            new JoinMetadata
+            {
+                Description = "Device is Online",
+                JoinType = eJoinType.Digital,
+                JoinCapabilities = eJoinCapabilities.ToSIMPL
+            });
+
+
+        public EssentialsPluginTemplateBridgeJoinMap(uint joinStart):base(joinStart, typeof(EssentialsPluginTemplateBridgeJoinMap))
+        {
+            
+        }
+    }
+}
\ No newline at end of file

From d590987143d0e60232b2d2fc582e2efe9bb433d3 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 20 Aug 2020 10:33:20 -0600
Subject: [PATCH 03/11] stop tracking .projectinfo files

---
 .gitignore                                       |   1 +
 .../PDT.EssentialsPluginTemplate.projectinfo     | Bin 1891 -> 0 bytes
 2 files changed, 1 insertion(+)
 delete mode 100644 PDT.EssentialsPluginTemplate.EPI/PDT.EssentialsPluginTemplate.projectinfo

diff --git a/.gitignore b/.gitignore
index e8d2744..314b11b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -355,3 +355,4 @@ MigrationBackup/
 # Crestron Zip Files
 *.cplz
 *.clz
+*.projectinfo
diff --git a/PDT.EssentialsPluginTemplate.EPI/PDT.EssentialsPluginTemplate.projectinfo b/PDT.EssentialsPluginTemplate.EPI/PDT.EssentialsPluginTemplate.projectinfo
deleted file mode 100644
index acdbdf8f5cab1846af2602a290df71e42cfcb017..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1891
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


From 07019ad6d80bb3882a0d70589db475d5276a4840 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 20 Aug 2020 10:40:28 -0600
Subject: [PATCH 04/11] update to new plugin factory method

---
 .../EssentailsPluginTemplate.cs               | 52 -------------------
 .../EssentailsPluginTemplateFactory.cs        | 43 +++++++++++++++
 .../EssentialsPluginTemplateDevice.cs         | 39 +++++++++-----
 3 files changed, 69 insertions(+), 65 deletions(-)
 delete mode 100644 PDT.EssentialsPluginTemplate.EPI/EssentailsPluginTemplate.cs
 create mode 100644 PDT.EssentialsPluginTemplate.EPI/EssentailsPluginTemplateFactory.cs

diff --git a/PDT.EssentialsPluginTemplate.EPI/EssentailsPluginTemplate.cs b/PDT.EssentialsPluginTemplate.EPI/EssentailsPluginTemplate.cs
deleted file mode 100644
index 0112c01..0000000
--- a/PDT.EssentialsPluginTemplate.EPI/EssentailsPluginTemplate.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System;
-using Crestron.SimplSharp;                          				// For Basic SIMPL# Classes
-using Crestron.SimplSharpPro;                       				// For Basic SIMPL#Pro classes
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-using PepperDash.Essentials;
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
-using PepperDash.Core;
-
-namespace EssentialsPluginTemplateEPI 
-{
-    /// <summary>
-    /// This class contains the necessary properties and static methods required to function as an Essentials Plugin
-    /// </summary>
-	public class EssentialsPluginFactory
-	{
-        /// <summary> 
-        /// This string is used to define the minimum version of the
-        /// Essentials Framework required for this plugin
-        /// </summary>
-        public static string MinimumEssentialsFrameworkVersion = "1.4.31";
-
-        /// <summary>
-        /// This method will get called by Essentials when this plugin is loaded.  
-        /// Use it to add factory methods for all new Device types defined in this plugin
-        /// </summary>
-		public static void LoadPlugin()
-		{
-			PepperDash.Essentials.Core.DeviceFactory.AddFactoryForType("EssentialsPluginTemplate", EssentialsPluginFactory.BuildDevice);	
-
-            // Add additional factories for each type here
-		}
-
-        /// <summary>
-        /// Builds an instance of the device type.  There should be method like this defined for each device type your plugin needs
-        /// to be able to build
-        /// </summary>
-        /// <param name="dc">The device configuration</param>
-        /// <returns>The device</returns>
-		public static EssentialsPluginTemplateDevice BuildDevice(DeviceConfig dc)
-		{
-			var config = JsonConvert.DeserializeObject<EssentialsPluginTemplatePropertiesConfig>(dc.Properties.ToString());
-			var newDevice = new EssentialsPluginTemplateDevice(dc.Key, dc.Name, config);
-			return newDevice;
-		}
-
-	}
-}
-
diff --git a/PDT.EssentialsPluginTemplate.EPI/EssentailsPluginTemplateFactory.cs b/PDT.EssentialsPluginTemplate.EPI/EssentailsPluginTemplateFactory.cs
new file mode 100644
index 0000000..79cfcf9
--- /dev/null
+++ b/PDT.EssentialsPluginTemplate.EPI/EssentailsPluginTemplateFactory.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using Crestron.SimplSharp;                          				// For Basic SIMPL# Classes
+using Crestron.SimplSharpPro;                       				// For Basic SIMPL#Pro classes
+
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+using PepperDash.Essentials;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Config;
+using PepperDash.Core;
+
+namespace EssentialsPluginTemplateEPI 
+{
+    /// <summary>
+    /// This class contains the necessary properties and methods required to function as an Essentials Plugin
+    /// </summary>
+	public class EssentialsPluginFactory:EssentialsPluginDeviceFactory<EssentialsPluginTemplateDevice>
+    {
+        public EssentialsPluginFactory()
+        {
+            // This string is used to define the minimum version of the
+            // Essentials Framework required for this plugin
+            MinimumEssentialsFrameworkVersion = "1.6.1";
+
+            //The strings defined in this list will be used in the configuration file to build the device in this plugin.
+            TypeNames = new List<string> {"essentialsPluginTemplateDevice"};
+        }
+
+        #region Overrides of EssentialsDeviceFactory<EssentialsPluginTemplateDevice>
+
+        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        {
+            var config = dc.Properties.ToObject<EssentialsPluginTemplatePropertiesConfig>();
+			var newDevice = new EssentialsPluginTemplateDevice(dc.Key, dc.Name, config);
+			return newDevice;
+        }
+
+        #endregion
+    }
+}
+
diff --git a/PDT.EssentialsPluginTemplate.EPI/EssentialsPluginTemplateDevice.cs b/PDT.EssentialsPluginTemplate.EPI/EssentialsPluginTemplateDevice.cs
index 9cfcd62..dda96b2 100644
--- a/PDT.EssentialsPluginTemplate.EPI/EssentialsPluginTemplateDevice.cs
+++ b/PDT.EssentialsPluginTemplate.EPI/EssentialsPluginTemplateDevice.cs
@@ -1,22 +1,16 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Essentials;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Newtonsoft.Json;
+using PDT.EssentialsPluginTemplate.EPI;
 using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Core;
-using PepperDash.Essentials.Bridges;
 
 namespace EssentialsPluginTemplateEPI
 {
     /// <summary>
     /// Example of a plugin device
     /// </summary>
-    public class EssentialsPluginTemplateDevice : Device, IBridge
+    public class EssentialsPluginTemplateDevice : EssentialsDevice, IBridgeAdvanced
     {
         /// <summary>
         /// Device Constructor.  Called by BuildDevice
@@ -46,9 +40,28 @@ namespace EssentialsPluginTemplateEPI
         /// <param name="trilist"></param>
         /// <param name="joinStart"></param>
         /// <param name="joinMapKey"></param>
-        public void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey)
+        public void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
         {
-            this.LinkToApi(trilist, joinStart, joinMapKey);
+            // Construct the default join map
+            var joinMap = new EssentialsPluginTemplateBridgeJoinMap(joinStart);
+
+            // Attempt to get a custom join map if specified in config
+            var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
+
+            // If we find a custom join map, deserialize it
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<EssentialsPluginTemplateBridgeJoinMap>(joinMapSerialized);
+
+            //Checking if the bridge is null allows for backwards compatability with configurations that use EiscApi instead of EiscApiAdvanced
+            if (bridge != null)
+            {
+                bridge.AddJoinMap(Key, joinMap);
+            }
+
+            // Set all your join actions here
+
+
+            // Link all your feedbacks to joins here
         }
     }
 }
\ No newline at end of file

From d28108a132eb1673efe1ee3b2a857626d9b4b884 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 20 Aug 2020 10:40:43 -0600
Subject: [PATCH 05/11] add .suo files to .gitignore

---
 .gitignore                                    |   1 +
 .../PDT.EssentialsPluginTemplate.EPI.suo      | Bin 22528 -> 23552 bytes
 2 files changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 314b11b..f218fa0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -356,3 +356,4 @@ MigrationBackup/
 *.cplz
 *.clz
 *.projectinfo
+*.suo
diff --git a/PDT.EssentialsPluginTemplate.EPI/PDT.EssentialsPluginTemplate.EPI.suo b/PDT.EssentialsPluginTemplate.EPI/PDT.EssentialsPluginTemplate.EPI.suo
index ad4bc104a0a3be5928a263b35e941a46b3399a4f..a6dd2adce2666f03d2a07f2d93e749e0acc25d16 100644
GIT binary patch
delta 459
zcmZqJz}T>ZaYFzTqt4_&HucFBOd>4W3=9mDCosvd{`>#`|G&)}nRYYsIjmg3E>M1r
zkr^oGptiY+rHxsj{6@vg54U_A=0vc$c*(!@n|zSNV6y`UGcPZL5Kx&Q5CaYPKlvhy
z%H$GJe_jS@polP%=;kk?=UJE-WhOiN=uiG4<v;nbpyA{aX)wL{i?k2FXb3|pLoP!B
zLkxo<gBci_FsMv+bQGQ3U@9?L$4Wq4g`teWh(V9R0EkV2q&bjh&JY7ub4W#uQ;)%!
zA)ld$A$9UW73EDjhh>=<`9St<{^EItlTl$ZqpUD*B11XQo*ag3AXzl|yt4eH5E+)K
zK!;9N2r=QE24qYJ;u%2vZ)4zm#zkRFlN&tb7!80vQ=EK2%7m>QC}qMpd1AO156H(b
z02IidY{0@wgdi~J)Lnqqmoa2ABm-$ThD0D;0(N>O&}+#I#Xvi53b;OF0=nLQ@`CUL
J6s*7@1pq7ypMn4Y

delta 203
zcmZqJ!Pu~YaYFzT%fJ8s|4$BKvVbrqFv)BT31OVXlEcUFq)O}HqpOU}3=9kos++4=
z+L#5BY8p;EF&cR7{usE*NwVtE<bxarn;kfqc{v${fXW1cc(PuU#^e%Fe@;eeAWs-7
zviXbXd6vn}0=AQ+ok7&(1|WTy#c=Z%X&?T{XY`gaPX=n;s4P6$z>j5<&S6<52ENIT
qKKh%#c%I>$q$4qTk*dgKyC9KCAu=pL2mha}5Mr`1WDVn@FeU)uaYq*b


From dd52a4e613d6ec3a2fd890d86045c247ca188bef Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 20 Aug 2020 10:41:10 -0600
Subject: [PATCH 06/11] Fix file name spelling

---
 ...luginTemplateFactory.cs => EssentialsPluginTemplateFactory.cs} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename PDT.EssentialsPluginTemplate.EPI/{EssentailsPluginTemplateFactory.cs => EssentialsPluginTemplateFactory.cs} (100%)

diff --git a/PDT.EssentialsPluginTemplate.EPI/EssentailsPluginTemplateFactory.cs b/PDT.EssentialsPluginTemplate.EPI/EssentialsPluginTemplateFactory.cs
similarity index 100%
rename from PDT.EssentialsPluginTemplate.EPI/EssentailsPluginTemplateFactory.cs
rename to PDT.EssentialsPluginTemplate.EPI/EssentialsPluginTemplateFactory.cs

From c67e67b94226ab7ea0b3774c74533d1f1b6b83ca Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 20 Aug 2020 10:49:04 -0600
Subject: [PATCH 07/11] fixing some files in the project file

---
 .../PDT.EssentialsPluginTemplate.EPI.csproj     |   4 ++--
 .../PDT.EssentialsPluginTemplate.EPI.suo        | Bin 23552 -> 0 bytes
 2 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 PDT.EssentialsPluginTemplate.EPI/PDT.EssentialsPluginTemplate.EPI.suo

diff --git a/PDT.EssentialsPluginTemplate.EPI/PDT.EssentialsPluginTemplate.EPI.csproj b/PDT.EssentialsPluginTemplate.EPI/PDT.EssentialsPluginTemplate.EPI.csproj
index 5a9ae47..e3bae95 100644
--- a/PDT.EssentialsPluginTemplate.EPI/PDT.EssentialsPluginTemplate.EPI.csproj
+++ b/PDT.EssentialsPluginTemplate.EPI/PDT.EssentialsPluginTemplate.EPI.csproj
@@ -91,9 +91,9 @@
     <Reference Include="System.Data" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="EssentailsPluginTemplate.cs" />
-    <Compile Include="EssentialsPluginTemplateBridge.cs" />
     <Compile Include="EssentialsPluginTemplateConfigObject.cs" />
+    <Compile Include="EssentialsPluginTemplateFactory.cs" />
+    <Compile Include="EssentialsPluginTemplateJoinMap.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="EssentialsPluginTemplateDevice.cs" />
     <None Include="Properties\ControlSystem.cfg" />
diff --git a/PDT.EssentialsPluginTemplate.EPI/PDT.EssentialsPluginTemplate.EPI.suo b/PDT.EssentialsPluginTemplate.EPI/PDT.EssentialsPluginTemplate.EPI.suo
deleted file mode 100644
index a6dd2adce2666f03d2a07f2d93e749e0acc25d16..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 23552
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
H8B^f@MESqf


From ff5ad93c6f445421c74132bc9be3b1fec0514b0b Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 20 Aug 2020 10:50:17 -0600
Subject: [PATCH 08/11] fix build workflow

---
 .github/workflows/docker.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 08c269d..12e5a06 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -6,7 +6,7 @@ on:
       - feature/*
       - hotfix/*
       - release/*
-      - master
+      - main
       - development
 
 env:
@@ -59,6 +59,11 @@ jobs:
         run: |
           Write-Output ${{ env.VERSION }}
           ./.github/scripts/UpdateAssemblyVersion.ps1 ${{ env.VERSION }}
+      - name: Login to Docker
+        uses: azure/docker-login@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
       # Build the solutions in the docker image
       - name: Build Solution
         shell: powershell

From 6b9316259272f9eb1955c8a77396fcbd99eb8dd5 Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 20 Aug 2020 10:52:34 -0600
Subject: [PATCH 09/11] fix docker hub secrets

---
 .github/workflows/docker.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 12e5a06..7a953a4 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -62,8 +62,8 @@ jobs:
       - name: Login to Docker
         uses: azure/docker-login@v1
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
       # Build the solutions in the docker image
       - name: Build Solution
         shell: powershell

From 4b4148af02c1470ce1f5cb135dae476ab9608a8c Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 20 Aug 2020 10:54:08 -0600
Subject: [PATCH 10/11] fix scripts to change master -> main

---
 .github/scripts/GenerateVersionNumber.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/scripts/GenerateVersionNumber.ps1 b/.github/scripts/GenerateVersionNumber.ps1
index d05aecd..052d48a 100644
--- a/.github/scripts/GenerateVersionNumber.ps1
+++ b/.github/scripts/GenerateVersionNumber.ps1
@@ -1,4 +1,4 @@
-$latestVersions = $(git tag --merged origin/master)
+$latestVersions = $(git tag --merged origin/main)
 $latestVersion = [version]"0.0.0"
 Foreach ($version in $latestVersions) {
   Write-Host $version
@@ -17,7 +17,7 @@ $newVersion = [version]$latestVersion
 $phase = ""
 $newVersionString = ""
 switch -regex ($Env:GITHUB_REF) {
-  '^refs\/heads\/master*.' {
+  '^refs\/heads\/main*.' {
     $newVersionString = "{0}.{1}.{2}" -f $newVersion.Major, $newVersion.Minor, ($newVersion.Build + 1)
   }
   '^refs\/heads\/feature\/*.' {

From 10c23fcd409a7481ed3cc93a1615dffd8b15cfde Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 20 Aug 2020 10:56:03 -0600
Subject: [PATCH 11/11] fix workflow to change master -> main

---
 .github/workflows/docker.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 7a953a4..bfff1c9 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -18,8 +18,8 @@ env:
   VERSION: 0.0.0-buildtype-buildnumber
   # Defaults to debug for build type
   BUILD_TYPE: Debug
-  # Defaults to master as the release branch.  Change as necessary
-  RELEASE_BRANCH: master
+  # Defaults to main as the release branch.  Change as necessary
+  RELEASE_BRANCH: main
 jobs:
   Build_Project:
     runs-on: windows-latest
@@ -38,7 +38,7 @@ jobs:
           git submodule sync --recursive
           git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
       # Set the BUILD_TYPE environment variable
-      - name: Set Build to Release if triggered from Master
+      - name: Set Build to Release if triggered from main
         run: |
           if("$($Env:GITHUB_REF)".contains("$($Env:RELEASE_BRANCH)")) {
             Write-Host "Setting build type to Release"