From 744004a85cd20526eff39e86c01669f3d2d48cb6 Mon Sep 17 00:00:00 2001
From: "Edwin Clement (Windows - Adam)" <edwinclement08@gmail.com>
Date: Wed, 6 Jul 2022 12:02:06 +0530
Subject: [PATCH 1/3] Added Source to binary argument string,

Also updated example to .Net  4.8
---
 BrowserStackLocal/BrowserStackLocal.sln       | 16 ++++--
 .../BrowserStackLocal.csproj                  |  1 +
 BrowserStackLocal/BrowserStackLocal/Local.cs  | 54 +++++++++++++++++--
 .../BrowserStackExample.csproj                |  6 ++-
 .../BrowserStackExample/app.config            |  3 ++
 5 files changed, 71 insertions(+), 9 deletions(-)
 create mode 100644 BrowserStackLocalExample/BrowserStackExample/app.config

diff --git a/BrowserStackLocal/BrowserStackLocal.sln b/BrowserStackLocal/BrowserStackLocal.sln
index ead4ad6..64dba3f 100644
--- a/BrowserStackLocal/BrowserStackLocal.sln
+++ b/BrowserStackLocal/BrowserStackLocal.sln
@@ -1,13 +1,16 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32414.318
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrowserStackLocal", "BrowserStackLocal\BrowserStackLocal.csproj", "{F58E1C9A-5910-4DA8-B531-9F4A6B0AE8C8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BrowserStackLocal", "BrowserStackLocal\BrowserStackLocal.csproj", "{F58E1C9A-5910-4DA8-B531-9F4A6B0AE8C8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrowserStackLocal Unit Tests", "BrowserStackLocal Unit Tests\BrowserStackLocal Unit Tests.csproj", "{FF1ABB6F-4A2C-48F4-B4DB-47DAD566D2F9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BrowserStackLocal Unit Tests", "BrowserStackLocal Unit Tests\BrowserStackLocal Unit Tests.csproj", "{FF1ABB6F-4A2C-48F4-B4DB-47DAD566D2F9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrowserStackLocalIntegrationTests", "BrowserStackLocalIntegrationTests\BrowserStackLocalIntegrationTests.csproj", "{01FFB287-C79A-4476-AEDB-EE8DE80EB3B3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BrowserStackLocalIntegrationTests", "BrowserStackLocalIntegrationTests\BrowserStackLocalIntegrationTests.csproj", "{01FFB287-C79A-4476-AEDB-EE8DE80EB3B3}"
+	ProjectSection(ProjectDependencies) = postProject
+		{F58E1C9A-5910-4DA8-B531-9F4A6B0AE8C8} = {F58E1C9A-5910-4DA8-B531-9F4A6B0AE8C8}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -31,4 +34,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {3019DB30-CCF5-4543-B787-FCBBD97B21C8}
+	EndGlobalSection
 EndGlobal
diff --git a/BrowserStackLocal/BrowserStackLocal/BrowserStackLocal.csproj b/BrowserStackLocal/BrowserStackLocal/BrowserStackLocal.csproj
index f28c436..9c189f6 100644
--- a/BrowserStackLocal/BrowserStackLocal/BrowserStackLocal.csproj
+++ b/BrowserStackLocal/BrowserStackLocal/BrowserStackLocal.csproj
@@ -8,6 +8,7 @@
     <Product>BrowserStackLocal</Product>
     <Description>C# Bindings for BrowserStack Local</Description>
     <Version>2.0.0.0</Version>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <FileVersion>2.0.0.0</FileVersion>
     <Authors>BrowserStack</Authors>
     <Company>BrowserStack</Company>
diff --git a/BrowserStackLocal/BrowserStackLocal/Local.cs b/BrowserStackLocal/BrowserStackLocal/Local.cs
index 26155bf..a3db0c8 100644
--- a/BrowserStackLocal/BrowserStackLocal/Local.cs
+++ b/BrowserStackLocal/BrowserStackLocal/Local.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
+using System.Reflection;
 
 namespace BrowserStack
 {
@@ -12,6 +13,8 @@ public class Local
     private string customLogPath = "";
     private string argumentString = "";
     private string customBinaryPath = "";
+    private string bindingVersion = "";
+        
     protected BrowserStackTunnel tunnel = null;
     private static KeyValuePair<string, string> emptyStringPair = new KeyValuePair<string, string>();
 
@@ -63,7 +66,11 @@ private void addArgs(string key, string value)
       {
 
       }
-      else
+      else if (key.Equals("source"))
+      {
+
+      }
+    else
       {
         result = valueCommands.Find(pair => pair.Key == key);
         if (!result.Equals(emptyStringPair))
@@ -92,10 +99,50 @@ private void addArgs(string key, string value)
         }
       }
     }
-    
+    public static string GetVersionString(string pVersionString)
+    {
+      string tVersion = "Unknown";
+      string[] aVersion;
+
+      if (string.IsNullOrEmpty(pVersionString)) { return tVersion; }
+      aVersion = pVersionString.Split('.');
+      if (aVersion.Length > 0) { tVersion = aVersion[0]; }
+      if (aVersion.Length > 1) { tVersion += "." + aVersion[1]; }
+      if (aVersion.Length > 2) { tVersion += "." + aVersion[2].PadLeft(4, '0'); }
+      if (aVersion.Length > 3) { tVersion += "." + aVersion[3].PadLeft(4, '0'); }
+
+      return tVersion;
+    }
+    public static Assembly GetAssemblyEmbedded(string pAssemblyDisplayName)
+    {
+       Assembly tMyAssembly = null;
+
+       if (string.IsNullOrEmpty(pAssemblyDisplayName)) { return tMyAssembly; }
+       try 
+       {
+          tMyAssembly = Assembly.Load(pAssemblyDisplayName);
+       }
+       catch (Exception ex)
+       {
+          string m = ex.Message;
+       }
+       return tMyAssembly;
+    }
+    public static string GetVersionStringFromAssemblyEmbedded(string pAssemblyDisplayName)
+    {
+       string tVersion = "Unknown";
+       Assembly tMyAssembly = null;
+
+       tMyAssembly = GetAssemblyEmbedded(pAssemblyDisplayName);
+       if (tMyAssembly == null) { return tVersion; }
+       tVersion = GetVersionString(tMyAssembly.GetName().Version.ToString());
+       return tVersion;
+    }
+
     public Local()
     {
-      tunnel = new BrowserStackTunnel();
+       bindingVersion = GetVersionStringFromAssemblyEmbedded("BrowserStackLocal");
+       tunnel = new BrowserStackTunnel();
     }
     public void start(List<KeyValuePair<string, string>> options)
     {
@@ -123,6 +170,7 @@ public void start(List<KeyValuePair<string, string>> options)
       }
 
       argumentString += "-logFile \"" + customLogPath + "\" ";
+      argumentString += "--source \"c-sharp:" + bindingVersion + "\" ";
       tunnel.addBinaryPath(customBinaryPath);
       tunnel.addBinaryArguments(argumentString);
       while (true) {
diff --git a/BrowserStackLocalExample/BrowserStackExample/BrowserStackExample.csproj b/BrowserStackLocalExample/BrowserStackExample/BrowserStackExample.csproj
index f4bb522..b994146 100644
--- a/BrowserStackLocalExample/BrowserStackExample/BrowserStackExample.csproj
+++ b/BrowserStackLocalExample/BrowserStackExample/BrowserStackExample.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BrowserStackExample</RootNamespace>
     <AssemblyName>BrowserStackExample</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
@@ -26,6 +26,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -83,6 +84,9 @@
   <ItemGroup>
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/BrowserStackLocalExample/BrowserStackExample/app.config b/BrowserStackLocalExample/BrowserStackExample/app.config
new file mode 100644
index 0000000..3e0e37c
--- /dev/null
+++ b/BrowserStackLocalExample/BrowserStackExample/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

From 2cf45c4b7e805772b81023642b42a0effac4589a Mon Sep 17 00:00:00 2001
From: "Edwin Clement (Windows - Adam)" <edwinclement08@gmail.com>
Date: Mon, 11 Jul 2022 10:56:46 +0530
Subject: [PATCH 2/3] Added logging to code

---
 BrowserStackLocal/BrowserStackLocal/Local.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BrowserStackLocal/BrowserStackLocal/Local.cs b/BrowserStackLocal/BrowserStackLocal/Local.cs
index a3db0c8..340bb0e 100644
--- a/BrowserStackLocal/BrowserStackLocal/Local.cs
+++ b/BrowserStackLocal/BrowserStackLocal/Local.cs
@@ -125,6 +125,7 @@ public static Assembly GetAssemblyEmbedded(string pAssemblyDisplayName)
        catch (Exception ex)
        {
           string m = ex.Message;
+          Console.Error.WriteLine(m);
        }
        return tMyAssembly;
     }

From 494c911e57d0b499c0a6085269f27c183ed0e9c8 Mon Sep 17 00:00:00 2001
From: "Edwin Clement (Windows - Adam)" <edwinclement08@gmail.com>
Date: Tue, 12 Jul 2022 10:04:26 +0530
Subject: [PATCH 3/3] Removed irrelevant changes

---
 .../BrowserStackExample/BrowserStackExample.csproj          | 6 +-----
 BrowserStackLocalExample/BrowserStackExample/app.config     | 3 ---
 2 files changed, 1 insertion(+), 8 deletions(-)
 delete mode 100644 BrowserStackLocalExample/BrowserStackExample/app.config

diff --git a/BrowserStackLocalExample/BrowserStackExample/BrowserStackExample.csproj b/BrowserStackLocalExample/BrowserStackExample/BrowserStackExample.csproj
index b994146..f4bb522 100644
--- a/BrowserStackLocalExample/BrowserStackExample/BrowserStackExample.csproj
+++ b/BrowserStackLocalExample/BrowserStackExample/BrowserStackExample.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BrowserStackExample</RootNamespace>
     <AssemblyName>BrowserStackExample</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
@@ -26,7 +26,6 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -84,9 +83,6 @@
   <ItemGroup>
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/BrowserStackLocalExample/BrowserStackExample/app.config b/BrowserStackLocalExample/BrowserStackExample/app.config
deleted file mode 100644
index 3e0e37c..0000000
--- a/BrowserStackLocalExample/BrowserStackExample/app.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>