Merge pull request #9 from botengine-de/use-current-sanderling

Seems this works now: http://forum.botengine.de/t/no-green-checkmark/819/20?u=viir
botengine-de · Apr 5, 2018 · 1e4a2ac · 1e4a2ac
2 parents f17f3c3 + 1b2a3bf
commit 1e4a2ac
Show file tree

Hide file tree

Showing 20 changed files with 54 additions and 11 deletions.
diff --git a/lib/BotEngine.Common.dll b/lib/BotEngine.Common.dll
diff --git a/lib/BotEngine.Interface.dll b/lib/BotEngine.Interface.dll
diff --git a/lib/BotEngine.UI.dll b/lib/BotEngine.UI.dll
diff --git a/lib/BotSharp.UI.dll b/lib/BotSharp.UI.dll
diff --git a/lib/BotSharp.dll b/lib/BotSharp.dll
diff --git a/lib/Sanderling.MemoryReading.dll b/lib/Sanderling.MemoryReading.dll
diff --git a/lib/Sanderling.UI.dll b/lib/Sanderling.UI.dll
diff --git a/lib/Sanderling.dll b/lib/Sanderling.dll
diff --git 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>
diff --git 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
@@ -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>
diff --git 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">17.05.03</system:String>
+            <system:String x:Key="AppVersionId">2018-04-04</system:String>
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
diff --git 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
@@ -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>
diff --git a/src/Sanderling.ABot.UI/Main.xaml.cs b/src/Sanderling.ABot.UI/Main.xaml.cs
@@ -19,15 +19,6 @@ public partial class Main : UserControl
 
 		public bool IsBotMotionEnabled => ToggleButtonMotionEnable?.ButtonRecz?.IsChecked ?? false;
 
-		public void ConfigFromModelToView(ExeConfig config) =>
-			Interface.LicenseView?.LicenseClientConfigViewModel?.PropagateFromClrMemberToDependencyProperty(config?.LicenseClient?.CompletedWithDefault());
-
-		public ExeConfig ConfigFromViewToModel() =>
-			new ExeConfig()
-			{
-				LicenseClient = Interface.LicenseView?.LicenseClientConfigViewModel?.PropagateFromDependencyPropertyToClrMember(),
-			};
-
 		public Main()
 		{
 			InitializeComponent();

diff --git 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
@@ -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>
diff --git 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
@@ -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>
diff --git 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>