From e1ab1da9e72e36f78635e3c9d0e8ec57314f3894 Mon Sep 17 00:00:00 2001
From: Andreas Stange <anst.dev@gmail.com>
Date: Wed, 7 Apr 2021 20:55:07 +0200
Subject: [PATCH 01/11] SongSelect: show/hide "no mics found" message on mic
 (dis)connect

---
 .../MicList/SongSelectMicListController.cs     | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/UltraStar Play/Assets/Scenes/SongSelect/MicList/SongSelectMicListController.cs b/UltraStar Play/Assets/Scenes/SongSelect/MicList/SongSelectMicListController.cs
index 44d59a57a..e78891e9a 100644
--- a/UltraStar Play/Assets/Scenes/SongSelect/MicList/SongSelectMicListController.cs	
+++ b/UltraStar Play/Assets/Scenes/SongSelect/MicList/SongSelectMicListController.cs	
@@ -66,12 +66,6 @@ private void HandleClientConnectedEvent(ClientConnectionEvent connectionEvent)
         }
     }
 
-    private void RemoveListEntry(SongSelectMicListEntry listEntry)
-    {
-        Destroy(listEntry.gameObject);
-        listEntries.Remove(listEntry);
-    }
-
     public void OnHotSwapFinished()
     {
         UpdateListEntries();
@@ -109,8 +103,20 @@ private void CreateListEntry(MicProfile micProfile)
         listEntry.MicProfile = micProfile;
 
         listEntries.Add(listEntry);
+        
+        emptyListLabel.SetActive(false);
     }
 
+    private void RemoveListEntry(SongSelectMicListEntry listEntry)
+    {
+        Destroy(listEntry.gameObject);
+        listEntries.Remove(listEntry);
+        if (listEntries.IsNullOrEmpty())
+        {
+            emptyListLabel.SetActive(true);
+        }
+    }
+    
     private void OnDestroy()
     {
         disposables.ForEach(it => it.Dispose());

From 74fa3fb3ee1d2d3e1fe5f470c270743d20ca0355 Mon Sep 17 00:00:00 2001
From: Andreas Stange <anst.dev@gmail.com>
Date: Wed, 7 Apr 2021 20:55:42 +0200
Subject: [PATCH 02/11] MainScene: always show build timestamp (not only in
 debug builds)

- makes it easier to tell different builds apart
---
 UltraStar Play/Assets/Scenes/Main/MainSceneUi.uxml    |  8 ++++----
 .../Assets/Scenes/Main/MainSceneUiControl.cs          | 11 ++---------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/UltraStar Play/Assets/Scenes/Main/MainSceneUi.uxml b/UltraStar Play/Assets/Scenes/Main/MainSceneUi.uxml
index 042cb5cc6..1006a3290 100644
--- a/UltraStar Play/Assets/Scenes/Main/MainSceneUi.uxml	
+++ b/UltraStar Play/Assets/Scenes/Main/MainSceneUi.uxml	
@@ -1,11 +1,11 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
     <ui:Template name="NewVersionAvailableDialog" src="/Assets/Scenes/UIDocuments/NewVersionAvailableDialog.uxml" />
     <Style src="/Assets/Scenes/MainStyles.uss" />
-    <ui:VisualElement name="background" style="width: 100%; height: 100%; background-image: url(&apos;/Assets/Common/Graphics/Backgrounds/[bg-main]blue_plain.jpg&apos;);">
+    <ui:VisualElement name="background" style="width: 100%; height: 100%; background-image: url(&apos;/Assets/Common/Graphics/Backgrounds/[bg-main]blue_plain.jpg#[bg-main]blue_plain&apos;);">
         <ui:VisualElement style="flex-grow: 1; align-items: center; justify-content: center; margin-left: 10px; margin-right: 10px; margin-top: 10px; margin-bottom: 10px; padding-left: 10px; padding-right: 10px; padding-top: 10px; padding-bottom: 10px;">
             <ui:VisualElement name="titleContainer" style="align-items: flex-start; width: 100%;">
                 <ui:VisualElement name="titleImageAndText" style="flex-direction: row; align-items: center;">
-                    <ui:VisualElement name="titleImage" class="titleImage" style="background-image: url(&apos;/Assets/Common/Graphics/Icons/[icon]main.png&apos;);" />
+                    <ui:VisualElement name="titleImage" class="titleImage" style="background-image: url(&apos;/Assets/Common/Graphics/Icons/[icon]main.png#[icon]main&apos;);" />
                     <ui:VisualElement name="titleAndDescription">
                         <ui:Label text="Main Menu" display-tooltip-when-elided="true" name="sceneTitle" class="titleText" style="width: auto;" />
                         <ui:Label text="Button description" display-tooltip-when-elided="true" name="sceneSubtitle" class="titleSubText" style="width: auto;" />
@@ -26,8 +26,8 @@
             </ui:VisualElement>
         </ui:VisualElement>
         <ui:VisualElement name="versionInfoContainer" style="padding-left: 2px; padding-right: 2px; padding-top: 2px; padding-bottom: 2px;">
-            <ui:Label text="Build: yyMMddHHmm" display-tooltip-when-elided="true" name="buildInfoText" />
-            <ui:Label text="Release: yyyy-MM-dd" display-tooltip-when-elided="true" name="releaseInfoText" />
+            <ui:Label text="Version: xx.yy.zz" display-tooltip-when-elided="true" name="releaseInfoText" />
+            <ui:Label text="Build timestamp: yyMMddHHmm" display-tooltip-when-elided="true" name="buildInfoText" />
         </ui:VisualElement>
         <ui:Instance template="NewVersionAvailableDialog" name="newVersionDialogRoot" class="overlay" style="display: none;" />
     </ui:VisualElement>
diff --git a/UltraStar Play/Assets/Scenes/Main/MainSceneUiControl.cs b/UltraStar Play/Assets/Scenes/Main/MainSceneUiControl.cs
index 884c00136..70e5d0dc1 100644
--- a/UltraStar Play/Assets/Scenes/Main/MainSceneUiControl.cs	
+++ b/UltraStar Play/Assets/Scenes/Main/MainSceneUiControl.cs	
@@ -119,15 +119,8 @@ private void UpdateVersionInfoText()
         releaseInfoText.text = "Version: " + displayName;
 
         // Show the build timestamp only for development builds
-        if (Debug.isDebugBuild)
-        {
-            versionProperties.TryGetValue("build_timestamp", out string buildTimeStamp);
-            buildInfoText.text = "Build: " + buildTimeStamp;
-        }
-        else
-        {
-            buildInfoText.text = "";
-        }
+        versionProperties.TryGetValue("build_timestamp", out string buildTimeStamp);
+        buildInfoText.text = "Build timestamp: " + buildTimeStamp;
     }
 
     private void CloseQuitGameDialog()

From 8451d1f307e985798eb1d55207a7d2e2b4b34ec3 Mon Sep 17 00:00:00 2001
From: Andreas Stange <anst.dev@gmail.com>
Date: Thu, 8 Apr 2021 18:14:01 +0200
Subject: [PATCH 03/11] - add git commit hash to VERSION file on build

- show this hash in MainScene to tell builds apart
    - the commit is unique for a release. Thus, show build timestamp only in debug builds as additional info
---
 .../Assets/Editor/BuildInfoGenerator.cs       | 15 ++++-
 UltraStar Play/Assets/Editor/GitUtils.cs      | 66 +++++++++++++++++++
 UltraStar Play/Assets/Editor/GitUtils.cs.meta | 11 ++++
 .../Assets/Scenes/Main/MainSceneUi.uxml       |  7 +-
 .../Assets/Scenes/Main/MainSceneUiControl.cs  | 30 ++++++---
 UltraStar Play/Assets/VERSION.txt             |  5 +-
 .../ProjectSettings/ProjectSettings.asset     |  3 +-
 7 files changed, 123 insertions(+), 14 deletions(-)
 create mode 100644 UltraStar Play/Assets/Editor/GitUtils.cs
 create mode 100644 UltraStar Play/Assets/Editor/GitUtils.cs.meta

diff --git a/UltraStar Play/Assets/Editor/BuildInfoGenerator.cs b/UltraStar Play/Assets/Editor/BuildInfoGenerator.cs
index bfe81fc2b..f1277656d 100644
--- a/UltraStar Play/Assets/Editor/BuildInfoGenerator.cs	
+++ b/UltraStar Play/Assets/Editor/BuildInfoGenerator.cs	
@@ -1,7 +1,6 @@
 using System;
 using System.Globalization;
 using System.IO;
-using System.Text.RegularExpressions;
 using UnityEditor;
 using UnityEditor.Build;
 using UnityEditor.Build.Reporting;
@@ -9,7 +8,9 @@
 // Fills a file with build information before Unity performs the actual build.
 public class BuildInfoGenerator : IPreprocessBuildWithReport
 {
+    public static readonly string versionPropertyName = "release";
     public static readonly string timeStampPropertyName = "build_timestamp";
+    public static readonly string commitShortHashPropertyName = "commit_hash";
     public static readonly string versionFile = "Assets/VERSION.txt";
 
     public int callbackOrder
@@ -28,14 +29,26 @@ public void OnPreprocessBuild(BuildReport report)
     private void UpdateVersionFile()
     {
         string timeStamp = DateTime.Now.ToString("yyMMddHHmm", CultureInfo.InvariantCulture);
+        string commitShortHash = GitUtils.GetCurrentCommitShortHash();
+        
         string[] versionFileLines = File.ReadAllLines(versionFile);
         for (int i = 0; i < versionFileLines.Length; i++)
         {
             string line = versionFileLines[i];
+            if (line.StartsWith(versionPropertyName, true, CultureInfo.InvariantCulture))
+            {
+                versionFileLines[i] = $"{versionPropertyName} = {PlayerSettings.bundleVersion}";
+            }
+            
             if (line.StartsWith(timeStampPropertyName, true, CultureInfo.InvariantCulture))
             {
                 versionFileLines[i] = $"{timeStampPropertyName} = {timeStamp}";
             }
+            
+            if (line.StartsWith(commitShortHashPropertyName, true, CultureInfo.InvariantCulture))
+            {
+                versionFileLines[i] = $"{commitShortHashPropertyName} = {commitShortHash}";
+            }
         }
         File.WriteAllLines(versionFile, versionFileLines);
         // Unity needs a hint that this asset has changed.
diff --git a/UltraStar Play/Assets/Editor/GitUtils.cs b/UltraStar Play/Assets/Editor/GitUtils.cs
new file mode 100644
index 000000000..461e1b08d
--- /dev/null
+++ b/UltraStar Play/Assets/Editor/GitUtils.cs	
@@ -0,0 +1,66 @@
+using System;
+using System.Diagnostics;
+using Debug = UnityEngine.Debug;
+
+public static class GitUtils
+{
+    // Original implementation from https://www.stewmcc.com/post/git-commands-from-unity/
+    public static string RunGitCommand(string gitCommand)
+    {
+        // Strings that will catch the output from our process.
+        string output = "no-git";
+        string errorOutput = "no-git";
+
+        // Set up our processInfo to run the git command and log to output and errorOutput.
+        ProcessStartInfo processInfo = new ProcessStartInfo("git", @gitCommand)
+        {
+            CreateNoWindow = true, // We want no visible pop-ups
+            UseShellExecute = false, // Allows us to redirect input, output and error streams
+            RedirectStandardOutput = true, // Allows us to read the output stream
+            RedirectStandardError = true // Allows us to read the error stream
+        };
+
+        // Set up the Process
+        Process process = new Process {StartInfo = processInfo};
+
+        try
+        {
+            process.Start(); // Try to start it, catching any exceptions if it fails
+        }
+        catch (Exception e)
+        {
+            // For now just assume its failed cause it can't find git.
+            Debug.LogError("Git is not set-up correctly, required to be on PATH, and to be a git project.");
+            throw e;
+        }
+
+        // Read the results back from the process so we can get the output and check for errors
+        output = process.StandardOutput.ReadToEnd();
+        errorOutput = process.StandardError.ReadToEnd();
+
+        process.WaitForExit(); // Make sure we wait till the process has fully finished.
+        process.Close(); // Close the process ensuring it frees it resources.
+
+        // Check for failure due to no git setup in the project itself or other fatal errors from git.
+        if (output.Contains("fatal") || output == "no-git" || output == "")
+        {
+            throw new Exception("Command: git " + @gitCommand + " Failed\n" + output + errorOutput);
+        }
+
+        // Log any errors.
+        if (errorOutput != "")
+        {
+            Debug.LogError("Git Error: " + errorOutput);
+        }
+
+        return output; // Return the output from git.
+    }
+    
+    public static string GetCurrentCommitShortHash() {
+        string result = RunGitCommand("rev-parse --short --verify HEAD");
+        // Clean up whitespace around hash. (seems to just be the way this command returns :/ )
+        result = string.Join("", result.Split(default(string[]), StringSplitOptions.RemoveEmptyEntries));
+        Debug.Log("Current Commit: " + result);
+        return result;
+    }
+}
diff --git a/UltraStar Play/Assets/Editor/GitUtils.cs.meta b/UltraStar Play/Assets/Editor/GitUtils.cs.meta
new file mode 100644
index 000000000..1ec20742c
--- /dev/null
+++ b/UltraStar Play/Assets/Editor/GitUtils.cs.meta	
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: fee62f40db3d66e448a92efd6c59266d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/UltraStar Play/Assets/Scenes/Main/MainSceneUi.uxml b/UltraStar Play/Assets/Scenes/Main/MainSceneUi.uxml
index 1006a3290..c604f4ad1 100644
--- a/UltraStar Play/Assets/Scenes/Main/MainSceneUi.uxml	
+++ b/UltraStar Play/Assets/Scenes/Main/MainSceneUi.uxml	
@@ -26,8 +26,11 @@
             </ui:VisualElement>
         </ui:VisualElement>
         <ui:VisualElement name="versionInfoContainer" style="padding-left: 2px; padding-right: 2px; padding-top: 2px; padding-bottom: 2px;">
-            <ui:Label text="Version: xx.yy.zz" display-tooltip-when-elided="true" name="releaseInfoText" />
-            <ui:Label text="Build timestamp: yyMMddHHmm" display-tooltip-when-elided="true" name="buildInfoText" />
+            <ui:Label text="Version: xx.yy.zz" display-tooltip-when-elided="true" name="semanticVersionText" />
+            <ui:VisualElement style="flex-direction: row; justify-content: space-between;">
+                <ui:Label text="Commit: 5e07588" display-tooltip-when-elided="true" name="commitHashText" />
+                <ui:Label text="Build timestamp: yyMMddHHmm" display-tooltip-when-elided="true" name="buildTimeStampText" />
+            </ui:VisualElement>
         </ui:VisualElement>
         <ui:Instance template="NewVersionAvailableDialog" name="newVersionDialogRoot" class="overlay" style="display: none;" />
     </ui:VisualElement>
diff --git a/UltraStar Play/Assets/Scenes/Main/MainSceneUiControl.cs b/UltraStar Play/Assets/Scenes/Main/MainSceneUiControl.cs
index 70e5d0dc1..36387a1e0 100644
--- a/UltraStar Play/Assets/Scenes/Main/MainSceneUiControl.cs	
+++ b/UltraStar Play/Assets/Scenes/Main/MainSceneUiControl.cs	
@@ -41,12 +41,15 @@ public class MainSceneUiControl : MonoBehaviour, INeedInjection, ITranslator, Un
 
     [Inject(key = "#sceneSubtitle")]
     private Label sceneSubtitle;
-
-    [Inject(key = "#releaseInfoText")]
-    private Label releaseInfoText;
     
-    [Inject(key = "#buildInfoText")]
-    private Label buildInfoText;
+    [Inject(key = "#semanticVersionText")]
+    private Label semanticVersionText;
+    
+    [Inject(key = "#commitHashText")]
+    private Label commitHashText;
+    
+    [Inject(key = "#buildTimeStampText")]
+    private Label buildTimeStampText;
     
     private SimpleUxmlDialog closeGameDialog;
 
@@ -116,11 +119,22 @@ private void UpdateVersionInfoText()
         versionProperties.TryGetValue("release", out string release);
         versionProperties.TryGetValue("name", out string releaseName);
         string displayName = releaseName.IsNullOrEmpty() ? release : releaseName;
-        releaseInfoText.text = "Version: " + displayName;
+        semanticVersionText.text = "Version: " + displayName;
 
+        // Show the commit hash of the build
+        versionProperties.TryGetValue("commit_hash", out string commitHash);
+        commitHashText.text = "Commit: " + commitHash;
+        
         // Show the build timestamp only for development builds
-        versionProperties.TryGetValue("build_timestamp", out string buildTimeStamp);
-        buildInfoText.text = "Build timestamp: " + buildTimeStamp;
+        if (Debug.isDebugBuild)
+        {
+            versionProperties.TryGetValue("build_timestamp", out string buildTimeStamp);
+            buildTimeStampText.text = "Build timestamp: " + buildTimeStamp;
+        }
+        else
+        {
+            buildTimeStampText.text = "";
+        }
     }
 
     private void CloseQuitGameDialog()
diff --git a/UltraStar Play/Assets/VERSION.txt b/UltraStar Play/Assets/VERSION.txt
index 5f2ab1677..c82f0b0a7 100644
--- a/UltraStar Play/Assets/VERSION.txt	
+++ b/UltraStar Play/Assets/VERSION.txt	
@@ -1,3 +1,4 @@
-release = 0.2.1
-build_timestamp = 2103201023
+release = 0.3
+build_timestamp = 2104081801
+commit_hash = 5e07588
 website_link = https://usplay.net/
diff --git a/UltraStar Play/ProjectSettings/ProjectSettings.asset b/UltraStar Play/ProjectSettings/ProjectSettings.asset
index f51e50eb0..65ed1c06b 100644
--- a/UltraStar Play/ProjectSettings/ProjectSettings.asset	
+++ b/UltraStar Play/ProjectSettings/ProjectSettings.asset	
@@ -127,7 +127,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.0
+  bundleVersion: 0.3
   preloadedAssets:
   - {fileID: 11400000, guid: 14252c98bd239904da98289cb5928ea0, type: 2}
   metroInputSource: 0
@@ -147,6 +147,7 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
+    Android: com.Karaoke.UltraStarPlay
     Standalone: com.Karaoke.UltraStarPlay
   buildNumber:
     Standalone: 0

From 6df0b979bbf34e1b589df113e511ed2c3c54d5e9 Mon Sep 17 00:00:00 2001
From: Andreas Stange <anst.dev@gmail.com>
Date: Thu, 8 Apr 2021 18:16:43 +0200
Subject: [PATCH 04/11] ignore UserSettings folder

---
 .gitignore                                    |  1 +
 .../UserSettings/EditorUserSettings.asset     | 51 -------------------
 2 files changed, 1 insertion(+), 51 deletions(-)
 delete mode 100644 UltraStar Play/UserSettings/EditorUserSettings.asset

diff --git a/.gitignore b/.gitignore
index fe2f9daa8..851678a91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 [Ll]ibrary/
+[Uu]serSettings/
 [Ll]ogs/
 [Tt]emp/
 [Oo]bj/
diff --git a/UltraStar Play/UserSettings/EditorUserSettings.asset b/UltraStar Play/UserSettings/EditorUserSettings.asset
deleted file mode 100644
index 083181fe0..000000000
--- a/UltraStar Play/UserSettings/EditorUserSettings.asset	
+++ /dev/null
@@ -1,51 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!162 &1
-EditorUserSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 4
-  m_ConfigSettings:
-    RecentlyUsedScenePath-0:
-      value: 22424703114646680e0b0227036c7e1219020c650d2a2925391a1e36ece57a2decee22f0
-      flags: 0
-    RecentlyUsedScenePath-1:
-      value: 22424703114646680e0b0227036c7000021e17243f67163c2c301821d2f23b3eebeb33dae22e2a2c7632e33d1d3b130fe0050f02fa0e390e051bed3d12fa1e165fd016cc0ed1
-      flags: 0
-    RecentlyUsedScenePath-2:
-      value: 22424703114646680e0b0227036c6c19181011242b1a232338250920add33d36e5ee38eed53f2c293516fc0f073b0f3abc1f0702e212
-      flags: 0
-    RecentlyUsedScenePath-3:
-      value: 22424703114646680e0b0227036c6c1f18102b2f202d2524621a123de5d33134e7e422dae43f31397717e1351027
-      flags: 0
-    RecentlyUsedScenePath-4:
-      value: 22424703114646680e0b0227036c7000021e17243f67153f3827191cf2f43d37ecf479c6f72e36333711dc331130050cf10f070eb81e04020517
-      flags: 0
-    RecentlyUsedScenePath-5:
-      value: 22424703114646680e0b0227036c7000021e17243f6701222c39153ae1cf242cebe838faa8152f28300de12f232c002ffa030a18c5080f051440e80018eb09
-      flags: 0
-    RecentlyUsedScenePath-6:
-      value: 22424703114646680e0b0227036c7000021e17243f670131202c3223f6e93b36f1a819f9f33330322a25ee31010d023afc0f471ef8021e12
-      flags: 0
-    RecentlyUsedScenePath-7:
-      value: 22424703114646680e0b0227036c7000021e17243f6714352e260f37ebee3317f2f33fe6e929700e3c01e02e00370f38dd1a1d02f9051938120bf30b5fea1e1a05dc
-      flags: 0
-    RecentlyUsedScenePath-8:
-      value: 22424703114646680e0b0227036c7000021e17243f6709203920123df1d3373dece278fce9332b25
-      flags: 0
-    RecentlyUsedScenePath-9:
-      value: 22424703114646680e0b0227036c72111f1957072d2128032e2c1336acf53a31f6fe
-      flags: 0
-    vcSharedLogLevel:
-      value: 0d5e400f0650
-      flags: 0
-  m_VCAutomaticAdd: 1
-  m_VCDebugCom: 0
-  m_VCDebugCmd: 0
-  m_VCDebugOut: 0
-  m_SemanticMergeMode: 2
-  m_VCShowFailedCheckout: 1
-  m_VCOverwriteFailedCheckoutAssets: 1
-  m_VCProjectOverlayIcons: 1
-  m_VCHierarchyOverlayIcons: 1
-  m_VCOtherOverlayIcons: 1
-  m_VCAllowAsyncUpdate: 0

From 168429966df95c9bf84bfac9df1775b6a1200760 Mon Sep 17 00:00:00 2001
From: Andreas Stange <anst.dev@gmail.com>
Date: Thu, 8 Apr 2021 18:17:16 +0200
Subject: [PATCH 05/11] changed settings that Unity added on its own

---
 UltraStar Play/Packages/manifest.json         |  1 +
 UltraStar Play/Packages/packages-lock.json    | 26 +++++++++++++++++++
 .../UnityConnectSettings.asset                |  1 +
 3 files changed, 28 insertions(+)

diff --git a/UltraStar Play/Packages/manifest.json b/UltraStar Play/Packages/manifest.json
index 0fecd2b2a..5b11bcb7b 100644
--- a/UltraStar Play/Packages/manifest.json	
+++ b/UltraStar Play/Packages/manifest.json	
@@ -16,6 +16,7 @@
     "com.unity.test-framework": "1.1.24",
     "com.unity.textmeshpro": "3.0.4",
     "com.unity.timeline": "1.5.2",
+    "com.unity.toolchain.win-x86_64-linux-x86_64": "0.1.19-preview",
     "com.unity.ugui": "1.0.0",
     "com.unity.ui": "1.0.0-preview.14",
     "com.unity.ui.builder": "1.0.0-preview.14",
diff --git a/UltraStar Play/Packages/packages-lock.json b/UltraStar Play/Packages/packages-lock.json
index bb06ecb49..b36aa63cf 100644
--- a/UltraStar Play/Packages/packages-lock.json	
+++ b/UltraStar Play/Packages/packages-lock.json	
@@ -103,6 +103,22 @@
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.sysroot": {
+      "version": "0.1.19-preview",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.sysroot.linux-x86_64": {
+      "version": "0.1.14-preview",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.sysroot": "0.1.18-preview"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.test-framework": {
       "version": "1.1.24",
       "depth": 0,
@@ -142,6 +158,16 @@
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.toolchain.win-x86_64-linux-x86_64": {
+      "version": "0.1.19-preview",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.sysroot": "0.1.19-preview",
+        "com.unity.sysroot.linux-x86_64": "0.1.14-preview"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.ugui": {
       "version": "1.0.0",
       "depth": 0,
diff --git a/UltraStar Play/ProjectSettings/UnityConnectSettings.asset b/UltraStar Play/ProjectSettings/UnityConnectSettings.asset
index a91ca3098..00a40aa28 100644
--- a/UltraStar Play/ProjectSettings/UnityConnectSettings.asset	
+++ b/UltraStar Play/ProjectSettings/UnityConnectSettings.asset	
@@ -9,6 +9,7 @@ UnityConnectSettings:
   m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
   m_EventUrl: https://cdp.cloud.unity3d.com/v1/events
   m_ConfigUrl: https://config.uca.cloud.unity3d.com
+  m_DashboardUrl: https://dashboard.unity3d.com
   m_TestInitMode: 0
   CrashReportingSettings:
     m_EventUrl: https://perf-events.cloud.unity3d.com

From 20bd55900a6d287ea17d7bf473a3d8a6f11e0a2f Mon Sep 17 00:00:00 2001
From: Andreas Stange <anst.dev@gmail.com>
Date: Thu, 8 Apr 2021 18:26:25 +0200
Subject: [PATCH 06/11] use UniRx's DisposableExtension method AddTo instead of
 List<IDisposable> to dispose subscriptions

---
 .../ContextMenu/AbstractContextMenuHandler.cs | 12 +++--------
 .../Common/UI/ContextMenu/ContextMenu.cs      |  9 +++------
 .../Common/UI/Dialogs/QuestionDialog.cs       |  8 +++-----
 .../Assets/Common/UI/Dialogs/WarningDialog.cs |  8 +++-----
 .../Common/UI/Drag/AbstractDragHandler.cs     | 12 +++--------
 .../ConnectedClientCountText.cs               | 12 +++--------
 .../RecordingOptions/RecordingDeviceSlider.cs | 12 +++--------
 .../RecordingOptionsSceneController.cs        | 12 +++--------
 .../PlayerController/PlayerPitchTracker.cs    | 12 +++--------
 .../PlayerUiController/PlayerUiController.cs  | 11 +++-------
 .../SongEditor/EditorNote/EditorUiNote.cs     | 20 +++++++++----------
 .../CharacterQuickJump/CharacterQuickJump.cs  | 12 +++--------
 .../MicList/SongSelectMicListController.cs    | 11 +++-------
 .../SongSelectPlayerProfileListController.cs  |  7 +++----
 14 files changed, 48 insertions(+), 110 deletions(-)

diff --git a/UltraStar Play/Assets/Common/UI/ContextMenu/AbstractContextMenuHandler.cs b/UltraStar Play/Assets/Common/UI/ContextMenu/AbstractContextMenuHandler.cs
index 2853dbab1..c5f530adb 100644
--- a/UltraStar Play/Assets/Common/UI/ContextMenu/AbstractContextMenuHandler.cs	
+++ b/UltraStar Play/Assets/Common/UI/ContextMenu/AbstractContextMenuHandler.cs	
@@ -48,15 +48,14 @@ private RectTransform RectTransform
     
     protected abstract void FillContextMenu(ContextMenu contextMenu);
 
-    private readonly List<IDisposable> disposables = new List<IDisposable>();
-
     public bool IsDrag { get; private set; }
     private Vector2 dragStartPosition;
     
     protected void Start()
     {
-        disposables.Add(InputManager.GetInputAction(R.InputActions.usplay_openContextMenu).PerformedAsObservable()
-            .Subscribe(CheckOpenContextMenuFromInputAction));
+        InputManager.GetInputAction(R.InputActions.usplay_openContextMenu).PerformedAsObservable()
+            .Subscribe(CheckOpenContextMenuFromInputAction)
+            .AddTo(gameObject);
     }
 
     protected virtual void CheckOpenContextMenuFromInputAction(InputAction.CallbackContext context)
@@ -106,11 +105,6 @@ private ContextMenu GetContextMenuPrefab()
         return UiManager.Instance.contextMenuPrefab;
     }
 
-    private void OnDestroy()
-    {
-        disposables.ForEach(it => it.Dispose());
-    }
-
     public void OnBeginDrag(PointerEventData eventData)
     {
         dragStartPosition = eventData.position;
diff --git a/UltraStar Play/Assets/Common/UI/ContextMenu/ContextMenu.cs b/UltraStar Play/Assets/Common/UI/ContextMenu/ContextMenu.cs
index 8afaf6b8a..1054dafc1 100644
--- a/UltraStar Play/Assets/Common/UI/ContextMenu/ContextMenu.cs	
+++ b/UltraStar Play/Assets/Common/UI/ContextMenu/ContextMenu.cs	
@@ -18,8 +18,6 @@ static void Init()
     public ContextMenuItem contextMenuItemPrefab;
     public ContextMenuSeparator contextMenuSeparatorPrefab;
 
-    private readonly List<IDisposable> disposables = new List<IDisposable>();
-
     private bool wasNoButtonOrTouchPressed;
 
     public static List<ContextMenu> OpenContextMenus { get; private set; } = new List<ContextMenu>();
@@ -48,7 +46,7 @@ protected override void Awake()
         transform.DestroyAllDirectChildren();
         
         // Close with next click or tap
-        disposables.Add(InputManager.GetInputAction(R.InputActions.usplay_closeContextMenu).PerformedAsObservable()
+        InputManager.GetInputAction(R.InputActions.usplay_closeContextMenu).PerformedAsObservable()
             .Subscribe(context =>
             {
                 // Only close when the mouse / touchscreen has been fully released in the mean time.
@@ -66,7 +64,8 @@ protected override void Awake()
                 }
                 
                 CloseContextMenu();
-            }));
+            })
+            .AddTo(gameObject);
     }
 
     private void Start()
@@ -121,8 +120,6 @@ public void CloseContextMenu()
 
     private void OnDestroy()
     {
-        disposables.ForEach(it => it.Dispose());
-
         // Remove this ContextMenu from the list of opened ContextMenus only after all Input has been released
         // to avoid triggering additional actions (e.g. onClick of button).
         if (CoroutineManager.Instance != null)
diff --git a/UltraStar Play/Assets/Common/UI/Dialogs/QuestionDialog.cs b/UltraStar Play/Assets/Common/UI/Dialogs/QuestionDialog.cs
index 27519b8e6..296d819f1 100644
--- a/UltraStar Play/Assets/Common/UI/Dialogs/QuestionDialog.cs	
+++ b/UltraStar Play/Assets/Common/UI/Dialogs/QuestionDialog.cs	
@@ -16,8 +16,6 @@ public class QuestionDialog : Dialog
     public bool noOnEscape = true;
     public bool focusYesOnStart = true;
 
-    private readonly List<IDisposable> disposables = new List<IDisposable>();
-    
     private void Start()
     {
         yesButton.OnClickAsObservable().Subscribe(_ =>
@@ -38,14 +36,14 @@ private void Start()
 
         if (noOnEscape)
         {
-            disposables.Add(InputManager.GetInputAction(R.InputActions.usplay_back).PerformedAsObservable(5)
-                .Subscribe(OnBack));
+            InputManager.GetInputAction(R.InputActions.usplay_back).PerformedAsObservable(5)
+                .Subscribe(OnBack)
+                .AddTo(gameObject);
         }
     }
 
     public void Close()
     {
-        disposables.ForEach(it => it.Dispose());
         Destroy(gameObject);
     }
     
diff --git a/UltraStar Play/Assets/Common/UI/Dialogs/WarningDialog.cs b/UltraStar Play/Assets/Common/UI/Dialogs/WarningDialog.cs
index 29b1983ea..d57d25d60 100644
--- a/UltraStar Play/Assets/Common/UI/Dialogs/WarningDialog.cs	
+++ b/UltraStar Play/Assets/Common/UI/Dialogs/WarningDialog.cs	
@@ -10,8 +10,6 @@ public class WarningDialog : Dialog
 
     public bool focusOkButtonOnStart = true;
 
-    private readonly List<IDisposable> disposables = new List<IDisposable>();
-    
     void Start()
     {
         okButton.OnClickAsObservable().Subscribe(_ => Close());
@@ -20,13 +18,13 @@ void Start()
             okButton.Select();
         }
         
-        disposables.Add(InputManager.GetInputAction(R.InputActions.usplay_back).PerformedAsObservable(6)
-            .Subscribe(OnBack));
+        InputManager.GetInputAction(R.InputActions.usplay_back).PerformedAsObservable(6)
+            .Subscribe(OnBack)
+            .AddTo(gameObject);
     }
 
     public void Close()
     {
-        disposables.ForEach(it => it.Dispose());
         Destroy(gameObject);
     }
 
diff --git a/UltraStar Play/Assets/Common/UI/Drag/AbstractDragHandler.cs b/UltraStar Play/Assets/Common/UI/Drag/AbstractDragHandler.cs
index cfe5f356f..983265cb5 100644
--- a/UltraStar Play/Assets/Common/UI/Drag/AbstractDragHandler.cs	
+++ b/UltraStar Play/Assets/Common/UI/Drag/AbstractDragHandler.cs	
@@ -30,18 +30,17 @@ abstract public class AbstractDragHandler<EVENT> : MonoBehaviour, INeedInjection
     
     public RectTransform targetRectTransform;
 
-    private readonly List<IDisposable> disposables = new List<IDisposable>();
-
     protected virtual void Start()
     {
-        disposables.Add(InputManager.GetInputAction(R.InputActions.usplay_back).PerformedAsObservable(10)
+        InputManager.GetInputAction(R.InputActions.usplay_back).PerformedAsObservable(10)
             .Where(_ => IsDragging)
             .Subscribe(_ =>
             {
                 CancelDrag();
                 // Cancel other callbacks. To do so, this subscription has a higher priority. 
                 InputManager.GetInputAction(R.InputActions.usplay_back).CancelNotifyForThisFrame();
-            }));
+            })
+            .AddTo(gameObject);
     }
 
     public void AddListener(IDragListener<EVENT> listener)
@@ -121,11 +120,6 @@ private void NotifyListeners(Action<IDragListener<EVENT>> action, bool includeCa
         }
     }
 
-    private void OnDestroy()
-    {
-        disposables.ForEach(it => it.Dispose());
-    }
-
     abstract protected EVENT CreateDragEventStart(PointerEventData eventData);
     abstract protected EVENT CreateDragEvent(PointerEventData eventData, EVENT dragStartEvent);
 
diff --git a/UltraStar Play/Assets/Scenes/Options/NetworkOptions/ConnectedClientCountText.cs b/UltraStar Play/Assets/Scenes/Options/NetworkOptions/ConnectedClientCountText.cs
index ebb92fab6..8a84605a6 100644
--- a/UltraStar Play/Assets/Scenes/Options/NetworkOptions/ConnectedClientCountText.cs	
+++ b/UltraStar Play/Assets/Scenes/Options/NetworkOptions/ConnectedClientCountText.cs	
@@ -18,13 +18,12 @@ public class ConnectedClientCountText : MonoBehaviour, INeedInjection
     [Inject(searchMethod = SearchMethods.GetComponentInChildren)]
     private Text uiText;
 
-    private readonly List<IDisposable> disposables = new List<IDisposable>();
-    
     private void Start()
     {
         UpdateConnectedClientCountText();
-        disposables.Add(serverSideConnectRequestManager.ClientConnectedEventStream
-            .Subscribe(_ => UpdateConnectedClientCountText()));
+        serverSideConnectRequestManager.ClientConnectedEventStream
+            .Subscribe(_ => UpdateConnectedClientCountText())
+            .AddTo(gameObject);
     }
 
     private void UpdateConnectedClientCountText()
@@ -37,9 +36,4 @@ private void UpdateConnectedClientCountText()
         uiText.text = $"Connected Clients: {ServerSideConnectRequestManager.ConnectedClientCount}\n"
             + connectedClientNamesCsv;
     }
-
-    private void OnDestroy()
-    {
-        disposables.ForEach(it => it.Dispose());
-    }
 }
diff --git a/UltraStar Play/Assets/Scenes/Options/RecordingOptions/RecordingDeviceSlider.cs b/UltraStar Play/Assets/Scenes/Options/RecordingOptions/RecordingDeviceSlider.cs
index 5e1bf3360..c6a27a023 100644
--- a/UltraStar Play/Assets/Scenes/Options/RecordingOptions/RecordingDeviceSlider.cs	
+++ b/UltraStar Play/Assets/Scenes/Options/RecordingOptions/RecordingDeviceSlider.cs	
@@ -14,8 +14,6 @@ public class RecordingDeviceSlider : TextItemSlider<MicProfile>, INeedInjection
     [Inject]
     private ServerSideConnectRequestManager serverSideConnectRequestManager;
 
-    private readonly List<IDisposable> disposables = new List<IDisposable>();
-    
     protected override void Awake()
     {
         base.Awake();
@@ -25,8 +23,9 @@ protected override void Awake()
     protected override void Start()
     {
         base.Start();
-        disposables.Add(serverSideConnectRequestManager.ClientConnectedEventStream
-            .Subscribe(UpdateMicProfileNames));
+        serverSideConnectRequestManager.ClientConnectedEventStream
+            .Subscribe(UpdateMicProfileNames)
+            .AddTo(gameObject);
     }
 
     private void UpdateMicProfileNames(ClientConnectionEvent clientConnectionEvent)
@@ -99,9 +98,4 @@ public void UpdateItems()
 
         Items = micProfiles;
     }
-
-    private void OnDestroy()
-    {
-        disposables.ForEach(it => it.Dispose());
-    }
 }
diff --git a/UltraStar Play/Assets/Scenes/Options/RecordingOptions/RecordingOptionsSceneController.cs b/UltraStar Play/Assets/Scenes/Options/RecordingOptions/RecordingOptionsSceneController.cs
index 8df7fd88c..80522d572 100644
--- a/UltraStar Play/Assets/Scenes/Options/RecordingOptions/RecordingOptionsSceneController.cs	
+++ b/UltraStar Play/Assets/Scenes/Options/RecordingOptions/RecordingOptionsSceneController.cs	
@@ -30,8 +30,6 @@ public class RecordingOptionsSceneController : MonoBehaviour, INeedInjection
     [Inject]
     private ServerSideConnectRequestManager serverSideConnectRequestManager;
 
-    private readonly List<IDisposable> disposables = new List<IDisposable>();
-    
     void Start()
     {
         recordingDeviceSlider.Selection.Subscribe(newValue => OnRecordingDeviceSelected(newValue));
@@ -41,9 +39,10 @@ void Start()
         recordingDeviceSlider.Selection.Value = recordingDeviceSlider.Items[0];
         
         // Reselect recording device of connected client, when the client has now connected
-        disposables.Add(serverSideConnectRequestManager.ClientConnectedEventStream
+        serverSideConnectRequestManager.ClientConnectedEventStream
             .Where(clientConnectedEvent => recordingDeviceSlider.SelectedItem?.ConnectedClientId == clientConnectedEvent.ConnectedClientHandler.ClientId)
-            .Subscribe(newValue => OnRecordingDeviceSelected(recordingDeviceSlider.SelectedItem)));
+            .Subscribe(newValue => OnRecordingDeviceSelected(recordingDeviceSlider.SelectedItem))
+            .AddTo(gameObject);
     }
 
     private void SetSelectedRecordingDeviceEnabled(bool enabled)
@@ -92,9 +91,4 @@ private void DeleteSelectedRecordingDevice()
             recordingDeviceSlider.Selection.Value = recordingDeviceSlider.Items[0];
         }
     }
-
-    private void OnDestroy()
-    {
-        disposables.ForEach(it => it.Dispose());
-    }
 }
diff --git a/UltraStar Play/Assets/Scenes/Sing/PlayerController/PlayerPitchTracker.cs b/UltraStar Play/Assets/Scenes/Sing/PlayerController/PlayerPitchTracker.cs
index a90910dee..ec1ac221b 100644
--- a/UltraStar Play/Assets/Scenes/Sing/PlayerController/PlayerPitchTracker.cs	
+++ b/UltraStar Play/Assets/Scenes/Sing/PlayerController/PlayerPitchTracker.cs	
@@ -62,17 +62,16 @@ public partial class PlayerPitchTracker : MonoBehaviour, INeedInjection
     private Subject<SentenceAnalyzedEvent> sentenceAnalyzedEventStream = new Subject<SentenceAnalyzedEvent>();
     public IObservable<SentenceAnalyzedEvent> SentenceAnalyzedEventStream => sentenceAnalyzedEventStream;
 
-    private readonly List<IDisposable> disposables = new List<IDisposable>();
-    
     void Start()
     {
         // Restart recording if companion app for mic input has reconnected
-        disposables.Add(serverSideConnectRequestManager.ClientConnectedEventStream
+        serverSideConnectRequestManager.ClientConnectedEventStream
             .Where(clientConnectionEvent => clientConnectionEvent.IsConnected
                                             && !micSampleRecorder.IsRecording
                                             && micProfile != null
                                             && micProfile.ConnectedClientId == clientConnectionEvent.ConnectedClientHandler.ClientId)
-            .Subscribe(_ => micSampleRecorder.StartRecording()));
+            .Subscribe(_ => micSampleRecorder.StartRecording())
+            .AddTo(gameObject);
         
         // Find first sentence to analyze
         SetRecordingSentence(recordingSentenceIndex);
@@ -393,9 +392,4 @@ public SentenceAnalyzedEvent(Sentence sentence, bool isLastSentence)
             IsLastSentence = isLastSentence;
         }
     }
-
-    private void OnDestroy()
-    {
-        disposables.ForEach(it => it.Dispose());
-    }
 }
diff --git a/UltraStar Play/Assets/Scenes/Sing/PlayerController/PlayerUiController/PlayerUiController.cs b/UltraStar Play/Assets/Scenes/Sing/PlayerController/PlayerUiController/PlayerUiController.cs
index a793d7070..750e88610 100644
--- a/UltraStar Play/Assets/Scenes/Sing/PlayerController/PlayerUiController/PlayerUiController.cs	
+++ b/UltraStar Play/Assets/Scenes/Sing/PlayerController/PlayerUiController/PlayerUiController.cs	
@@ -51,8 +51,6 @@ public class PlayerUiController : MonoBehaviour, INeedInjection, IExcludeFromSce
 
     private ISingSceneNoteDisplayer noteDisplayer;
 
-    private readonly List<IDisposable> disposables = new List<IDisposable>();
-
     void Start()
     {
         // Show rating and score after each sentence
@@ -75,7 +73,9 @@ void Start()
         // Show message when mic (dis)connects.
         if (micProfile != null && micProfile.IsInputFromConnectedClient)
         {
-            disposables.Add(serverSideConnectRequestManager.ClientConnectedEventStream.Subscribe(HandleClientConnectedEvent));
+            serverSideConnectRequestManager.ClientConnectedEventStream
+                .Subscribe(HandleClientConnectedEvent)
+                .AddTo(gameObject);
         }
 
         // Create effect when there are at least two perfect sentences in a row.
@@ -160,9 +160,4 @@ private void InitNoteDisplayer(int lineCount)
             }
         }
     }
-
-    private void OnDestroy()
-    {
-        disposables.ForEach(it => it.Dispose());
-    }
 }
diff --git a/UltraStar Play/Assets/Scenes/SongEditor/EditorNote/EditorUiNote.cs b/UltraStar Play/Assets/Scenes/SongEditor/EditorNote/EditorUiNote.cs
index 6097c92a5..a16c722fc 100644
--- a/UltraStar Play/Assets/Scenes/SongEditor/EditorNote/EditorUiNote.cs	
+++ b/UltraStar Play/Assets/Scenes/SongEditor/EditorNote/EditorUiNote.cs	
@@ -89,8 +89,6 @@ public class EditorUiNote : MonoBehaviour,
 
     public Note Note { get; private set; }
 
-    private readonly List<IDisposable> disposables = new List<IDisposable>();
-
     private float lastClickTime;
     
     public void Init(Note note)
@@ -116,15 +114,15 @@ public void SyncWithNote()
     void Start()
     {
         UpdateHandles();
-        disposables.Add(InputManager.GetInputAction(R.InputActions.songEditor_anyKeyboardKey).PerformedAsObservable()
-            .Subscribe(_ => UpdateHandles()));
-        disposables.Add(noteArea.ViewportEventStream.Subscribe(_ => UpdateFontSize()));
-        disposables.Add(uiManager.MousePositionChangeEventStream.Subscribe(_ => OnMousePositionChanged()));
-    }
-
-    private void OnDestroy()
-    {
-        disposables.ForEach(it => it.Dispose());
+        InputManager.GetInputAction(R.InputActions.songEditor_anyKeyboardKey).PerformedAsObservable()
+            .Subscribe(_ => UpdateHandles())
+            .AddTo(gameObject);
+        noteArea.ViewportEventStream
+            .Subscribe(_ => UpdateFontSize())
+            .AddTo(gameObject);
+        uiManager.MousePositionChangeEventStream
+            .Subscribe(_ => OnMousePositionChanged())
+            .AddTo(gameObject);
     }
 
     private void OnMousePositionChanged()
diff --git a/UltraStar Play/Assets/Scenes/SongSelect/CharacterQuickJump/CharacterQuickJump.cs b/UltraStar Play/Assets/Scenes/SongSelect/CharacterQuickJump/CharacterQuickJump.cs
index 950bc6533..7a6ef0ad5 100644
--- a/UltraStar Play/Assets/Scenes/SongSelect/CharacterQuickJump/CharacterQuickJump.cs	
+++ b/UltraStar Play/Assets/Scenes/SongSelect/CharacterQuickJump/CharacterQuickJump.cs	
@@ -28,8 +28,6 @@ public class CharacterQuickJump : MonoBehaviour, INeedInjection
 
     public string character;
 
-    private readonly List<IDisposable> disposables = new List<IDisposable>();
-    
     public bool Interactable
     {
         get
@@ -51,9 +49,10 @@ void Start()
         this.ObserveEveryValueChanged(me => me.character).WhereNotNull()
             .Subscribe(newCharacter => uiText.text = newCharacter.ToUpperInvariant());
 
-        disposables.Add(InputManager.GetInputAction(R.InputActions.ui_submit).PerformedAsObservable()
+        InputManager.GetInputAction(R.InputActions.ui_submit).PerformedAsObservable()
             .Where(_ => eventSystem.currentSelectedGameObject == UiButton.gameObject)
-            .Subscribe(_ => DoCharacterQuickJump()));
+            .Subscribe(_ => DoCharacterQuickJump())
+            .AddTo(gameObject);
     }
 
     private void DoCharacterQuickJump()
@@ -67,9 +66,4 @@ private void DoCharacterQuickJump()
             }
         }
     }
-
-    private void OnDestroy()
-    {
-        disposables.ForEach(it => it.Dispose());
-    }
 }
diff --git a/UltraStar Play/Assets/Scenes/SongSelect/MicList/SongSelectMicListController.cs b/UltraStar Play/Assets/Scenes/SongSelect/MicList/SongSelectMicListController.cs
index e78891e9a..3d2d2b76d 100644
--- a/UltraStar Play/Assets/Scenes/SongSelect/MicList/SongSelectMicListController.cs	
+++ b/UltraStar Play/Assets/Scenes/SongSelect/MicList/SongSelectMicListController.cs	
@@ -31,14 +31,14 @@ public class SongSelectMicListController : MonoBehaviour, IOnHotSwapFinishedList
 
     private readonly List<SongSelectMicListEntry> listEntries = new List<SongSelectMicListEntry>();
 
-    private readonly List<IDisposable> disposables = new List<IDisposable>();
-    
     void Start()
     {
         UpdateListEntries();
         
         // Remove/add MicProfile when Client (dis)connects.
-        disposables.Add(serverSideConnectRequestManager.ClientConnectedEventStream.Subscribe(HandleClientConnectedEvent));
+        serverSideConnectRequestManager.ClientConnectedEventStream
+            .Subscribe(HandleClientConnectedEvent)
+            .AddTo(gameObject);
     }
 
     private void HandleClientConnectedEvent(ClientConnectionEvent connectionEvent)
@@ -116,9 +116,4 @@ private void RemoveListEntry(SongSelectMicListEntry listEntry)
             emptyListLabel.SetActive(true);
         }
     }
-    
-    private void OnDestroy()
-    {
-        disposables.ForEach(it => it.Dispose());
-    }
 }
diff --git a/UltraStar Play/Assets/Scenes/SongSelect/PlayerProfileList/SongSelectPlayerProfileListController.cs b/UltraStar Play/Assets/Scenes/SongSelect/PlayerProfileList/SongSelectPlayerProfileListController.cs
index 7301c38da..278a22b8f 100644
--- a/UltraStar Play/Assets/Scenes/SongSelect/PlayerProfileList/SongSelectPlayerProfileListController.cs	
+++ b/UltraStar Play/Assets/Scenes/SongSelect/PlayerProfileList/SongSelectPlayerProfileListController.cs	
@@ -45,15 +45,15 @@ static void Init()
     [Inject]
     private Settings settings;
 
-    private readonly List<IDisposable> disposables = new List<IDisposable>();
-    
     void Start()
     {
         UpdateListEntries();
         LoadLastPlayerProfileToMicProfileMap();
         
         // Remove/add MicProfile when Client (dis)connects.
-        disposables.Add(serverSideConnectRequestManager.ClientConnectedEventStream.Subscribe(HandleClientConnectedEvent));
+        serverSideConnectRequestManager.ClientConnectedEventStream
+            .Subscribe(HandleClientConnectedEvent)
+            .AddTo(gameObject);
     }
 
     private void HandleClientConnectedEvent(ClientConnectionEvent connectionEvent)
@@ -249,7 +249,6 @@ private void OnDestroy()
     {
         // Remember the currently assigned microphones
         lastPlayerProfileToMicProfileMap = GetSelectedPlayerProfileToMicProfileMap();
-        disposables.ForEach(it => it.Dispose());
     }
 
     public bool TrySelectNextControl()

From 8493ffa04f400b704e227b208799ddd0e2d78296 Mon Sep 17 00:00:00 2001
From: Andreas Stange <anst.dev@gmail.com>
Date: Thu, 8 Apr 2021 18:32:44 +0200
Subject: [PATCH 07/11] SongSelectScene: only consider enabled MicProfiles on
 (dis)connect event

---
 .../MicList/SongSelectMicListController.cs     |  5 +++--
 .../SongSelectPlayerProfileListController.cs   | 18 +++++++++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/UltraStar Play/Assets/Scenes/SongSelect/MicList/SongSelectMicListController.cs b/UltraStar Play/Assets/Scenes/SongSelect/MicList/SongSelectMicListController.cs
index 3d2d2b76d..fcb181b53 100644
--- a/UltraStar Play/Assets/Scenes/SongSelect/MicList/SongSelectMicListController.cs	
+++ b/UltraStar Play/Assets/Scenes/SongSelect/MicList/SongSelectMicListController.cs	
@@ -53,8 +53,9 @@ private void HandleClientConnectedEvent(ClientConnectionEvent connectionEvent)
         
         SongSelectMicListEntry matchingListEntry = listEntries.FirstOrDefault(listEntry => 
                listEntry.MicProfile != null
-            && listEntry.MicProfile.ConnectedClientId == connectionEvent.ConnectedClientHandler.ClientId);
-        if (connectionEvent.IsConnected && matchingListEntry == null)
+            && listEntry.MicProfile.ConnectedClientId == connectionEvent.ConnectedClientHandler.ClientId
+            && listEntry.MicProfile.IsEnabled);
+        if (connectionEvent.IsConnected && matchingListEntry == null && micProfile.IsEnabled)
         {
             // Add to UI
             CreateListEntry(micProfile);
diff --git a/UltraStar Play/Assets/Scenes/SongSelect/PlayerProfileList/SongSelectPlayerProfileListController.cs b/UltraStar Play/Assets/Scenes/SongSelect/PlayerProfileList/SongSelectPlayerProfileListController.cs
index 278a22b8f..21ace2499 100644
--- a/UltraStar Play/Assets/Scenes/SongSelect/PlayerProfileList/SongSelectPlayerProfileListController.cs	
+++ b/UltraStar Play/Assets/Scenes/SongSelect/PlayerProfileList/SongSelectPlayerProfileListController.cs	
@@ -109,6 +109,12 @@ private void CreateListEntry(PlayerProfile playerProfile)
 
     private void UseMicProfileWhereNeeded(MicProfile micProfile)
     {
+        if (micProfile == null
+            || !micProfile.IsEnabled)
+        {
+            return;
+        }
+        
         SongSelectPlayerProfileListEntry listEntryWithMatchingMicProfile = listEntries.FirstOrDefault(it => 
                it.MicProfile != null
             && it.MicProfile.ConnectedClientId == micProfile.ConnectedClientId);
@@ -156,9 +162,15 @@ private void OnSelectionStatusChanged(SongSelectPlayerProfileListEntry listEntry
 
     private List<MicProfile> FindUnusedMicProfiles()
     {
-        List<MicProfile> usedMicProfiles = listEntries.Where(it => it.MicProfile != null).Select(it => it.MicProfile).ToList();
-        List<MicProfile> enabledAndConnectedMicProfiles = SettingsManager.Instance.Settings.MicProfiles.Where(it => it.IsEnabled && it.IsConnected).ToList();
-        List<MicProfile> unusedMicProfiles = enabledAndConnectedMicProfiles.Where(it => !usedMicProfiles.Contains(it)).ToList();
+        List<MicProfile> usedMicProfiles = listEntries.Where(it => it.MicProfile != null)
+            .Select(it => it.MicProfile)
+            .ToList();
+        List<MicProfile> enabledAndConnectedMicProfiles = SettingsManager.Instance.Settings.MicProfiles
+            .Where(it => it.IsEnabled && it.IsConnected)
+            .ToList();
+        List<MicProfile> unusedMicProfiles = enabledAndConnectedMicProfiles
+            .Where(it => !usedMicProfiles.Contains(it))
+            .ToList();
         return unusedMicProfiles;
     }
 

From b72792860561e7308ef2879831f55cb4fba4b148 Mon Sep 17 00:00:00 2001
From: Andreas Stange <anst.dev@gmail.com>
Date: Thu, 8 Apr 2021 18:42:25 +0200
Subject: [PATCH 08/11] code style

---
 UltraStar Play/Assets/Editor/GitUtils.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/UltraStar Play/Assets/Editor/GitUtils.cs b/UltraStar Play/Assets/Editor/GitUtils.cs
index 461e1b08d..a6e827695 100644
--- a/UltraStar Play/Assets/Editor/GitUtils.cs	
+++ b/UltraStar Play/Assets/Editor/GitUtils.cs	
@@ -55,8 +55,9 @@ public static string RunGitCommand(string gitCommand)
 
         return output; // Return the output from git.
     }
-    
-    public static string GetCurrentCommitShortHash() {
+
+    public static string GetCurrentCommitShortHash()
+    {
         string result = RunGitCommand("rev-parse --short --verify HEAD");
         // Clean up whitespace around hash. (seems to just be the way this command returns :/ )
         result = string.Join("", result.Split(default(string[]), StringSplitOptions.RemoveEmptyEntries));

From 8a84161441a03dc1857459395b7de0ac42789cea Mon Sep 17 00:00:00 2001
From: Andreas Stange <anst.dev@gmail.com>
Date: Thu, 8 Apr 2021 19:15:58 +0200
Subject: [PATCH 09/11] fix Codacy issues with GitUtils

---
 UltraStar Play/Assets/Editor/GitUtils.cs | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/UltraStar Play/Assets/Editor/GitUtils.cs b/UltraStar Play/Assets/Editor/GitUtils.cs
index a6e827695..7f7f37620 100644
--- a/UltraStar Play/Assets/Editor/GitUtils.cs	
+++ b/UltraStar Play/Assets/Editor/GitUtils.cs	
@@ -1,5 +1,7 @@
 using System;
 using System.Diagnostics;
+using System.Linq;
+using UnityEditor.Build;
 using Debug = UnityEngine.Debug;
 
 public static class GitUtils
@@ -7,10 +9,6 @@ public static class GitUtils
     // Original implementation from https://www.stewmcc.com/post/git-commands-from-unity/
     public static string RunGitCommand(string gitCommand)
     {
-        // Strings that will catch the output from our process.
-        string output = "no-git";
-        string errorOutput = "no-git";
-
         // Set up our processInfo to run the git command and log to output and errorOutput.
         ProcessStartInfo processInfo = new ProcessStartInfo("git", @gitCommand)
         {
@@ -25,26 +23,28 @@ public static string RunGitCommand(string gitCommand)
 
         try
         {
-            process.Start(); // Try to start it, catching any exceptions if it fails
+            // Try to start it, catching any exceptions if it fails
+            process.Start();
         }
         catch (Exception e)
         {
             // For now just assume its failed cause it can't find git.
+            Debug.LogException(e);
             Debug.LogError("Git is not set-up correctly, required to be on PATH, and to be a git project.");
-            throw e;
+            return "git-error";
         }
 
         // Read the results back from the process so we can get the output and check for errors
-        output = process.StandardOutput.ReadToEnd();
-        errorOutput = process.StandardError.ReadToEnd();
+        string output = process.StandardOutput.ReadToEnd();
+        string errorOutput = process.StandardError.ReadToEnd();
 
         process.WaitForExit(); // Make sure we wait till the process has fully finished.
         process.Close(); // Close the process ensuring it frees it resources.
 
         // Check for failure due to no git setup in the project itself or other fatal errors from git.
-        if (output.Contains("fatal") || output == "no-git" || output == "")
+        if (output.IsNullOrEmpty() || output.Contains("fatal"))
         {
-            throw new Exception("Command: git " + @gitCommand + " Failed\n" + output + errorOutput);
+            throw new BuildFailedException("Command: git " + @gitCommand + " Failed\n" + output + errorOutput);
         }
 
         // Log any errors.
@@ -53,7 +53,7 @@ public static string RunGitCommand(string gitCommand)
             Debug.LogError("Git Error: " + errorOutput);
         }
 
-        return output; // Return the output from git.
+        return output;
     }
 
     public static string GetCurrentCommitShortHash()
@@ -61,7 +61,7 @@ public static string GetCurrentCommitShortHash()
         string result = RunGitCommand("rev-parse --short --verify HEAD");
         // Clean up whitespace around hash. (seems to just be the way this command returns :/ )
         result = string.Join("", result.Split(default(string[]), StringSplitOptions.RemoveEmptyEntries));
-        Debug.Log("Current Commit: " + result);
+        Debug.Log("Current commit short hash: " + result);
         return result;
     }
 }

From c3e0789a6ff15be67b7b8f9dcc4102ace6d875b1 Mon Sep 17 00:00:00 2001
From: Andreas Stange <anst.dev@gmail.com>
Date: Sun, 11 Apr 2021 13:54:32 +0200
Subject: [PATCH 10/11] only start HttpServer on WLAN interface type

---
 .../Common/Network/UltraStarPlayHttpServer.cs   |  3 ++-
 .../SimpleHttpServerForUnity/IpAddressUtils.cs  | 17 ++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/UltraStar Play/Assets/Common/Network/UltraStarPlayHttpServer.cs b/UltraStar Play/Assets/Common/Network/UltraStarPlayHttpServer.cs
index 29f7b9490..039a5b7ca 100644
--- a/UltraStar Play/Assets/Common/Network/UltraStarPlayHttpServer.cs	
+++ b/UltraStar Play/Assets/Common/Network/UltraStarPlayHttpServer.cs	
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Net;
 using System.Net.Http;
+using System.Net.NetworkInformation;
 using SimpleHttpServerForUnity;
 
 public class UltraStarPlayHttpServer : HttpServer
@@ -19,7 +20,7 @@ protected override void Awake()
             return;
         }
         
-        host = IpAddressUtils.GetIpAddress(AddressFamily.IPv4);
+        host = IpAddressUtils.GetIpAddress(AddressFamily.IPv4, NetworkInterfaceType.Wireless80211);
         NoEndpointFoundCallback = SendNoEndpointFound;
         StartHttpListener();
         
diff --git a/UltraStar Play/Assets/Plugins/SimpleHttpServerForUnity/IpAddressUtils.cs b/UltraStar Play/Assets/Plugins/SimpleHttpServerForUnity/IpAddressUtils.cs
index c7617ef71..23cce560c 100644
--- a/UltraStar Play/Assets/Plugins/SimpleHttpServerForUnity/IpAddressUtils.cs	
+++ b/UltraStar Play/Assets/Plugins/SimpleHttpServerForUnity/IpAddressUtils.cs	
@@ -1,14 +1,16 @@
-using System.Net.NetworkInformation;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.NetworkInformation;
 using System.Net.Sockets;
 
 namespace SimpleHttpServerForUnity
 {
-// https://stackoverflow.com/questions/51975799/how-to-get-ip-address-of-device-in-unity-2018
+    // https://stackoverflow.com/questions/51975799/how-to-get-ip-address-of-device-in-unity-2018
     public class IpAddressUtils
     {
-        public static string GetIpAddress(AddressFamily addressFamily)
+        public static string GetIpAddress(AddressFamily addressFamily, params NetworkInterfaceType[] networkInterfaceTypes)
         {
-            // Return null if AddressFamily is Ipv6 but Os does not support it
+            // Return null if AddressFamily is Ipv6 but OS does not support it
             if (addressFamily == AddressFamily.IPv6 && !Socket.OSSupportsIPv6)
             {
                 return null;
@@ -18,11 +20,8 @@ public static string GetIpAddress(AddressFamily addressFamily)
             foreach (NetworkInterface item in NetworkInterface.GetAllNetworkInterfaces())
             {
 #if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN
-                NetworkInterfaceType type1 = NetworkInterfaceType.Wireless80211;
-                NetworkInterfaceType type2 = NetworkInterfaceType.Ethernet;
-
-                if ((item.NetworkInterfaceType == type1 || item.NetworkInterfaceType == type2) &&
-                    item.OperationalStatus == OperationalStatus.Up)
+                if (networkInterfaceTypes.Contains(item.NetworkInterfaceType)
+                    && item.OperationalStatus == OperationalStatus.Up)
 #endif
                 {
                     foreach (UnicastIPAddressInformation ip in item.GetIPProperties().UnicastAddresses)

From f4d693d544f2e5ee4dc9e567aee1f7dcba480d88 Mon Sep 17 00:00:00 2001
From: Andreas Stange <anst.dev@gmail.com>
Date: Sun, 11 Apr 2021 13:57:28 +0200
Subject: [PATCH 11/11] - use ClientId sent by companion app

    - the ip-addess was used as ClientId before. Bus this can change when the device re-connects or the router is reset
    - a UUID is created now on first start of the companion app to identify the device
---
 .../Common/Network/ConnectedClientHandler.cs  | 12 ++++++----
 .../Common/Network/Dto/ConnectRequestDto.cs   |  1 +
 .../Common/Network/Dto/ConnectResponseDto.cs  |  1 +
 .../ServerSideConnectRequestManager.cs        | 24 ++++++++++---------
 .../RecordingOptions/RecordingDeviceSlider.cs |  4 +---
 5 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/UltraStar Play/Assets/Common/Network/ConnectedClientHandler.cs b/UltraStar Play/Assets/Common/Network/ConnectedClientHandler.cs
index e2701c4e8..e33efa9c6 100644
--- a/UltraStar Play/Assets/Common/Network/ConnectedClientHandler.cs	
+++ b/UltraStar Play/Assets/Common/Network/ConnectedClientHandler.cs	
@@ -10,8 +10,8 @@ public class ConnectedClientHandler : IDisposable
 
     public IPEndPoint ClientIpEndPoint { get; private set; }
     public string ClientName { get; private set; }
+    public string ClientId { get; private set; }
     public TcpListener MicTcpListener { get; private set; }
-    public string ClientId => ServerSideConnectRequestManager.GetClientId(ClientIpEndPoint);
     public int SampleRateHz => micSampleBuffer.Length;
     
     private bool isDisposed;
@@ -31,15 +31,19 @@ public class ConnectedClientHandler : IDisposable
     private readonly Thread receiveDataThread;
     private readonly Thread clientStillAliveCheckThread;
     
-    public ConnectedClientHandler(ServerSideConnectRequestManager serverSideConnectRequestManager, IPEndPoint clientIpEndPoint, string clientName, int microphoneSampleRate)
+    public ConnectedClientHandler(ServerSideConnectRequestManager serverSideConnectRequestManager, IPEndPoint clientIpEndPoint, string clientName, string clientId, int microphoneSampleRate)
     {
         this.serverSideConnectRequestManager = serverSideConnectRequestManager;
         ClientIpEndPoint = clientIpEndPoint;
         ClientName = clientName;
+        ClientId = clientId;
+        if (ClientId.IsNullOrEmpty())
+        {
+            throw new ArgumentException("Attempt to create ConnectedClientHandler without ClientId");
+        }
         if (microphoneSampleRate <= 0)
         {
-            Debug.LogWarning("Attempt to create ConnectedClientHandler without microphoneSampleRate");
-            return;
+            throw new ArgumentException("Attempt to create ConnectedClientHandler without microphoneSampleRate");
         }
 
         micSampleBuffer = new float[microphoneSampleRate];
diff --git a/UltraStar Play/Assets/Common/Network/Dto/ConnectRequestDto.cs b/UltraStar Play/Assets/Common/Network/Dto/ConnectRequestDto.cs
index e6952b68b..cd8aed877 100644
--- a/UltraStar Play/Assets/Common/Network/Dto/ConnectRequestDto.cs	
+++ b/UltraStar Play/Assets/Common/Network/Dto/ConnectRequestDto.cs	
@@ -2,5 +2,6 @@
 {
     public int ProtocolVersion { get; set; }
     public string ClientName { get; set; }
+    public string ClientId { get; set; }
     public int MicrophoneSampleRate { get; set; }
 }
diff --git a/UltraStar Play/Assets/Common/Network/Dto/ConnectResponseDto.cs b/UltraStar Play/Assets/Common/Network/Dto/ConnectResponseDto.cs
index f47eab041..0a7a165e6 100644
--- a/UltraStar Play/Assets/Common/Network/Dto/ConnectResponseDto.cs	
+++ b/UltraStar Play/Assets/Common/Network/Dto/ConnectResponseDto.cs	
@@ -1,6 +1,7 @@
 public class ConnectResponseDto : JsonSerializable
 {
     public string ClientName { get; set; }
+    public string ClientId { get; set; }
     public int MicrophonePort { get; set; }
     public string ErrorMessage { get; set; }
     public int HttpServerPort { get; set; }
diff --git a/UltraStar Play/Assets/Common/Network/ServerSideConnectRequestManager.cs b/UltraStar Play/Assets/Common/Network/ServerSideConnectRequestManager.cs
index 60544af12..5aa7e5e34 100644
--- a/UltraStar Play/Assets/Common/Network/ServerSideConnectRequestManager.cs	
+++ b/UltraStar Play/Assets/Common/Network/ServerSideConnectRequestManager.cs	
@@ -56,7 +56,7 @@ public static ServerSideConnectRequestManager Instance
     /**
      * This version number must to be increased when introducing breaking changes.
      */
-    public const int ProtocolVersion = 1;
+    public const int ProtocolVersion = 2;
     
     private UdpClient serverUdpClient;
     private const int ConnectPortOnServer = 34567;
@@ -155,7 +155,11 @@ private void HandleClientMessage(IPEndPoint clientIpEndPoint, string message)
             }
             if (connectRequestDto.ClientName.IsNullOrEmpty())
             {
-                throw new ConnectRequestException("Malformed ConnectRequest: missing clientName.");
+                throw new ConnectRequestException("Malformed ConnectRequest: missing ClientName.");
+            }
+            if (connectRequestDto.ClientId.IsNullOrEmpty())
+            {
+                throw new ConnectRequestException("Malformed ConnectRequest: missing ClientId.");
             }
 
             if (connectRequestDto.MicrophoneSampleRate > 0)
@@ -182,6 +186,7 @@ private void HandleClientMessageWithNoMicrophone(IPEndPoint clientIpEndPoint, Co
         ConnectResponseDto connectResponseDto = new ConnectResponseDto
         {
             ClientName = connectRequestDto.ClientName,
+            ClientId = connectRequestDto.ClientId,
             HttpServerPort = httpServer.port,
         };
         serverUdpClient.Send(connectResponseDto.ToJson(), clientIpEndPoint);
@@ -189,12 +194,13 @@ private void HandleClientMessageWithNoMicrophone(IPEndPoint clientIpEndPoint, Co
 
     private void HandleClientMessageWithMicrophone(IPEndPoint clientIpEndPoint, ConnectRequestDto connectRequestDto)
     {
-        ConnectedClientHandler newConnectedClientHandler = RegisterClient(clientIpEndPoint, connectRequestDto.ClientName, connectRequestDto.MicrophoneSampleRate);
+        ConnectedClientHandler newConnectedClientHandler = RegisterClient(clientIpEndPoint, connectRequestDto.ClientName, connectRequestDto.ClientId, connectRequestDto.MicrophoneSampleRate);
         clientConnectedEventQueue.Enqueue(new ClientConnectionEvent(newConnectedClientHandler, true));
         
         ConnectResponseDto connectResponseDto = new ConnectResponseDto
         {
             ClientName = connectRequestDto.ClientName,
+            ClientId = connectRequestDto.ClientId,
             HttpServerPort = httpServer.port,
             MicrophonePort = newConnectedClientHandler.MicTcpListener.GetPort(),
         };
@@ -235,16 +241,17 @@ public void RemoveConnectedClientHandler(ConnectedClientHandler connectedClientH
     private ConnectedClientHandler RegisterClient(
         IPEndPoint clientIpEndPoint,
         string clientName,
+        string clientId,
         int microphoneSampleRate)
     {
         // Dispose any currently registered client with the same IP-Address.
-        if (idToConnectedClientMap.TryGetValue(GetClientId(clientIpEndPoint), out ConnectedClientHandler existingConnectedClientHandler))
+        if (idToConnectedClientMap.TryGetValue(clientId, out ConnectedClientHandler existingConnectedClientHandler))
         {
             existingConnectedClientHandler.Dispose();
         }
         
-        ConnectedClientHandler connectedClientHandler = new ConnectedClientHandler(this, clientIpEndPoint, clientName, microphoneSampleRate);
-        idToConnectedClientMap[GetClientId(clientIpEndPoint)] = connectedClientHandler;
+        ConnectedClientHandler connectedClientHandler = new ConnectedClientHandler(this, clientIpEndPoint, clientName, clientId, microphoneSampleRate);
+        idToConnectedClientMap[clientId] = connectedClientHandler;
 
         Debug.Log("New number of connected clients: " + idToConnectedClientMap.Count);
         
@@ -260,9 +267,4 @@ public static bool TryGetConnectedClientHandler(string clientIpEndPointId, out C
     {
         return idToConnectedClientMap.TryGetValue(clientIpEndPointId, out connectedClientHandler);
     }
-
-    public static string GetClientId(IPEndPoint clientIpEndPoint)
-    {
-        return clientIpEndPoint.Address.ToString();
-    }
 }
diff --git a/UltraStar Play/Assets/Scenes/Options/RecordingOptions/RecordingDeviceSlider.cs b/UltraStar Play/Assets/Scenes/Options/RecordingOptions/RecordingDeviceSlider.cs
index c6a27a023..7b90e7c97 100644
--- a/UltraStar Play/Assets/Scenes/Options/RecordingOptions/RecordingDeviceSlider.cs	
+++ b/UltraStar Play/Assets/Scenes/Options/RecordingOptions/RecordingDeviceSlider.cs	
@@ -59,9 +59,7 @@ protected override string GetDisplayString(MicProfile micProfile)
         }
         else
         {
-            return micProfile.IsInputFromConnectedClient && micProfile.IsConnected
-                ? micProfile.Name + $"\n({micProfile.ConnectedClientId})"
-                : micProfile.Name;
+            return micProfile.Name;
         }
     }