From 73225e959b4ce0fa13337a5a0ca12ae5a72bb81b Mon Sep 17 00:00:00 2001
From: Chen-I Lim <chenilim@gmail.com>
Date: Fri, 16 Jul 2021 10:30:45 -0700
Subject: [PATCH] Merge release-0.8.0

---
 mac/Focalboard/Info.plist            | 2 +-
 mattermost-plugin/plugin.json        | 2 +-
 mattermost-plugin/server/manifest.go | 2 +-
 server/model/version.go              | 1 +
 webapp/package-lock.json             | 4 ++--
 webapp/package.json                  | 2 +-
 webapp/src/constants.ts              | 2 +-
 webapp/src/octoListener.ts           | 6 +++++-
 win-wpf/AppxManifest.xml             | 2 +-
 9 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/mac/Focalboard/Info.plist b/mac/Focalboard/Info.plist
index 26deae31f..acdda82cf 100644
--- a/mac/Focalboard/Info.plist
+++ b/mac/Focalboard/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.8.0</string>
+	<string>0.8.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
diff --git a/mattermost-plugin/plugin.json b/mattermost-plugin/plugin.json
index bfe993e9e..71baf18e9 100644
--- a/mattermost-plugin/plugin.json
+++ b/mattermost-plugin/plugin.json
@@ -6,7 +6,7 @@
     "support_url": "https://github.com/mattermost/focalboard/issues",
     "release_notes_url": "https://github.com/mattermost/focalboard/releases",
     "icon_path": "assets/starter-template-icon.svg",
-    "version": "0.8.0",
+    "version": "0.8.1",
     "min_server_version": "5.37.0",
     "server": {
         "executables": {
diff --git a/mattermost-plugin/server/manifest.go b/mattermost-plugin/server/manifest.go
index 516e7fd6f..7b1a7e1b0 100644
--- a/mattermost-plugin/server/manifest.go
+++ b/mattermost-plugin/server/manifest.go
@@ -19,7 +19,7 @@ const manifestStr = `
   "support_url": "https://github.com/mattermost/focalboard/issues",
   "release_notes_url": "https://github.com/mattermost/focalboard/releases",
   "icon_path": "assets/starter-template-icon.svg",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "min_server_version": "5.37.0",
   "server": {
     "executables": {
diff --git a/server/model/version.go b/server/model/version.go
index 4c7fb8b59..a843c9f1c 100644
--- a/server/model/version.go
+++ b/server/model/version.go
@@ -4,6 +4,7 @@ package model
 // It should be maintained in chronological order with most current
 // release at the front of the list.
 var versions = []string{
+	"0.8.1",
 	"0.8.0",
 	"0.7.3",
 	"0.7.2",
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index 21a9dc486..af4a8bed2 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "focalboard",
-	"version": "0.8.0",
+	"version": "0.8.1",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "focalboard",
-			"version": "0.8.0",
+			"version": "0.8.1",
 			"dependencies": {
 				"@reduxjs/toolkit": "^1.6.0",
 				"emoji-mart": "^3.0.1",
diff --git a/webapp/package.json b/webapp/package.json
index c75fa1567..34795a33e 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "focalboard",
-	"version": "0.8.0",
+	"version": "0.8.1",
 	"private": true,
 	"description": "",
 	"scripts": {
diff --git a/webapp/src/constants.ts b/webapp/src/constants.ts
index 05423fb4c..3e5a146f4 100644
--- a/webapp/src/constants.ts
+++ b/webapp/src/constants.ts
@@ -19,7 +19,7 @@ class Constants {
     static readonly defaultTitleColumnWidth = 280
     static readonly titleColumnId = '__title'
 
-    static readonly versionString = '0.8.0'
+    static readonly versionString = '0.8.1'
 }
 
 export {Constants}
diff --git a/webapp/src/octoListener.ts b/webapp/src/octoListener.ts
index 8da5a6dd8..52984fef5 100644
--- a/webapp/src/octoListener.ts
+++ b/webapp/src/octoListener.ts
@@ -141,7 +141,11 @@ class OctoListener {
         try {
             ws?.close()
         } catch {
-            Utils.log('OctoListener unable to close the websocket')
+            try {
+                (ws as any)?.websocket?.close()
+            } catch {
+                Utils.log('OctoListener unable to close the websocket')
+            }
         }
     }
 
diff --git a/win-wpf/AppxManifest.xml b/win-wpf/AppxManifest.xml
index 47ddd0d1a..4434c0c6e 100644
--- a/win-wpf/AppxManifest.xml
+++ b/win-wpf/AppxManifest.xml
@@ -2,7 +2,7 @@
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
     xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
     xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities">
-    <Identity Name="MattermostInc.Focalboard" Publisher="CN=5C59534D-C37D-4D0C-8464-26AA0D0B6EFE" Version="0.8.0.0" ProcessorArchitecture="x64" />
+    <Identity Name="MattermostInc.Focalboard" Publisher="CN=5C59534D-C37D-4D0C-8464-26AA0D0B6EFE" Version="0.8.1.0" ProcessorArchitecture="x64" />
     <Properties>
         <DisplayName>Focalboard</DisplayName>
         <PublisherDisplayName>Mattermost, Inc.</PublisherDisplayName>