From 1b2a3bf318cc8a01f30f73dab58c3ff8ddedb8ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20R=C3=A4tzel?= <Viir@Viir.de>
Date: Wed, 4 Apr 2018 09:02:39 +0000
Subject: [PATCH] Adapt To Changes In Memory Reading Implementation

Adapt to observation of exception thrown with call stack in memory measurement:
----
System.IO.FileNotFoundException: 'Could not load file or assembly 'System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51' or one of its dependencies. The system cannot find the file specified.'
---
 src/Sanderling.ABot.Exe/App.config                    |  4 ++++
 src/Sanderling.ABot.Exe/Sanderling.ABot.Exe.csproj    |  7 ++++++-
 src/Sanderling.ABot.Exe/packages.config               |  1 +
 src/Sanderling.ABot.Exe/resource.xaml                 |  2 +-
 .../Sanderling.ABot.Test.Exe.csproj                   |  1 +
 src/Sanderling.ABot.Test.Exe/app.config               | 11 +++++++++++
 src/Sanderling.ABot.UI/Sanderling.ABot.UI.csproj      |  3 +++
 src/Sanderling.ABot.UI/app.config                     | 11 +++++++++++
 src/Sanderling.ABot/Sanderling.ABot.csproj            |  4 ++++
 src/Sanderling.ABot/app.config                        | 11 +++++++++++
 src/Sanderling.ABot/packages.config                   |  1 +
 11 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 src/Sanderling.ABot.Test.Exe/app.config
 create mode 100644 src/Sanderling.ABot.UI/app.config
 create mode 100644 src/Sanderling.ABot/app.config

diff --git a/src/Sanderling.ABot.Exe/App.config b/src/Sanderling.ABot.Exe/App.config
index 8541194..402f3ab 100644
--- a/src/Sanderling.ABot.Exe/App.config
+++ b/src/Sanderling.ABot.Exe/App.config
@@ -17,6 +17,10 @@
         <assemblyIdentity name="ICSharpCode.AvalonEdit" publicKeyToken="9cc39be672370310" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.0.3.0" newVersion="5.0.3.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/src/Sanderling.ABot.Exe/Sanderling.ABot.Exe.csproj b/src/Sanderling.ABot.Exe/Sanderling.ABot.Exe.csproj
index 59549be..feb06a9 100644
--- a/src/Sanderling.ABot.Exe/Sanderling.ABot.Exe.csproj
+++ b/src/Sanderling.ABot.Exe/Sanderling.ABot.Exe.csproj
@@ -99,6 +99,9 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
+    <Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Core" />
@@ -173,7 +176,9 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="App.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Sanderling.ABot.UI\Sanderling.ABot.UI.csproj">
diff --git a/src/Sanderling.ABot.Exe/packages.config b/src/Sanderling.ABot.Exe/packages.config
index 814dfc8..a4368c0 100644
--- a/src/Sanderling.ABot.Exe/packages.config
+++ b/src/Sanderling.ABot.Exe/packages.config
@@ -8,5 +8,6 @@
   <package id="InputSimulator" version="1.0.4.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
   <package id="protobuf-net" version="2.1.0" targetFramework="net461" />
+  <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" />
   <package id="WpfAutoGrid" version="1.4.0.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/src/Sanderling.ABot.Exe/resource.xaml b/src/Sanderling.ABot.Exe/resource.xaml
index d51b712..c702e37 100644
--- a/src/Sanderling.ABot.Exe/resource.xaml
+++ b/src/Sanderling.ABot.Exe/resource.xaml
@@ -7,7 +7,7 @@
         <ResourceDictionary Source="pack://application:,,,/Sanderling.ABot.UI;component/resource.xaml"></ResourceDictionary>
 
         <ResourceDictionary>
-            <system:String x:Key="AppVersionId">2018-03-25</system:String>
+            <system:String x:Key="AppVersionId">2018-04-04</system:String>
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Sanderling.ABot.Test.Exe/Sanderling.ABot.Test.Exe.csproj b/src/Sanderling.ABot.Test.Exe/Sanderling.ABot.Test.Exe.csproj
index 7618095..543da44 100644
--- a/src/Sanderling.ABot.Test.Exe/Sanderling.ABot.Test.Exe.csproj
+++ b/src/Sanderling.ABot.Test.Exe/Sanderling.ABot.Test.Exe.csproj
@@ -103,6 +103,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Sanderling.ABot.Test.Exe/app.config b/src/Sanderling.ABot.Test.Exe/app.config
new file mode 100644
index 0000000..00adf8d
--- /dev/null
+++ b/src/Sanderling.ABot.Test.Exe/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/src/Sanderling.ABot.UI/Sanderling.ABot.UI.csproj b/src/Sanderling.ABot.UI/Sanderling.ABot.UI.csproj
index 22df505..ff2c38d 100644
--- a/src/Sanderling.ABot.UI/Sanderling.ABot.UI.csproj
+++ b/src/Sanderling.ABot.UI/Sanderling.ABot.UI.csproj
@@ -93,6 +93,9 @@
       <Name>Sanderling.ABot</Name>
     </ProjectReference>
   </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/src/Sanderling.ABot.UI/app.config b/src/Sanderling.ABot.UI/app.config
new file mode 100644
index 0000000..00adf8d
--- /dev/null
+++ b/src/Sanderling.ABot.UI/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/src/Sanderling.ABot/Sanderling.ABot.csproj b/src/Sanderling.ABot/Sanderling.ABot.csproj
index 3b0b59f..1dbd14e 100644
--- a/src/Sanderling.ABot/Sanderling.ABot.csproj
+++ b/src/Sanderling.ABot/Sanderling.ABot.csproj
@@ -50,6 +50,9 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -86,6 +89,7 @@
     <Compile Include="StringAtPath.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/src/Sanderling.ABot/app.config b/src/Sanderling.ABot/app.config
new file mode 100644
index 0000000..00adf8d
--- /dev/null
+++ b/src/Sanderling.ABot/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/src/Sanderling.ABot/packages.config b/src/Sanderling.ABot/packages.config
index f5455f9..6c21634 100644
--- a/src/Sanderling.ABot/packages.config
+++ b/src/Sanderling.ABot/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="InputSimulator" version="1.0.4.0" targetFramework="net461" />
+  <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" />
 </packages>
\ No newline at end of file