Skip to content

Commit

Permalink
Merge pull request #6 from NECROBOTIO/master
Browse files Browse the repository at this point in the history 
Syncing with latest
  • Loading branch information
@jurannus
jurannus authored Aug 11, 2016
2 parents 2c65d7b + 3087aff commit 4835242
Show file tree
Hide file tree
Showing 8 changed files with 99 additions and 109 deletions.
2 changes: 1 addition & 1 deletion FeroxRev
Submodule FeroxRev updated from ae7e1b to ebbb81
2 changes: 1 addition & 1 deletion PoGo.NecroBot.CLI/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
Expand Down
2 changes: 1 addition & 1 deletion PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PoGo.NecroBot.CLI</RootNamespace>
<AssemblyName>NecroBot</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
Expand Down
96 changes: 48 additions & 48 deletions PoGo.NecroBot.CLI/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,57 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="C5" version="2.4.5947.17249" targetFramework="net462" />
<package id="C5" version="2.4.5947.17249" targetFramework="net452" />
<package id="Google.Protobuf" version="3.0.0-beta4" targetFramework="net45" />
<package id="log4net" version="2.0.5" targetFramework="net45" />
<package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="net462" />
<package id="Microsoft.Win32.Primitives" version="4.0.1" targetFramework="net462" />
<package id="NETStandard.Library" version="1.6.0" targetFramework="net462" />
<package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="net452" />
<package id="Microsoft.Win32.Primitives" version="4.0.1" targetFramework="net452" />
<package id="NETStandard.Library" version="1.6.0" targetFramework="net452" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
<package id="S2Geometry" version="1.0.3" targetFramework="net462" />
<package id="S2Geometry" version="1.0.3" targetFramework="net452" />
<package id="SuperSocket" version="1.6.6.1" targetFramework="net45" />
<package id="SuperSocket.Engine" version="1.6.6.1" targetFramework="net45" />
<package id="SuperSocket.WebSocket" version="1.6.6.1" targetFramework="net45" />
<package id="System.AppContext" version="4.1.0" targetFramework="net462" />
<package id="System.Collections" version="4.0.11" targetFramework="net462" />
<package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net462" />
<package id="System.Console" version="4.0.0" targetFramework="net462" />
<package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net462" />
<package id="System.Diagnostics.DiagnosticSource" version="4.0.0" targetFramework="net462" />
<package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="net462" />
<package id="System.Diagnostics.Tracing" version="4.1.0" targetFramework="net462" />
<package id="System.Globalization" version="4.0.11" targetFramework="net462" />
<package id="System.Globalization.Calendars" version="4.0.1" targetFramework="net462" />
<package id="System.IO" version="4.1.0" targetFramework="net462" />
<package id="System.IO.Compression" version="4.1.0" targetFramework="net462" />
<package id="System.IO.Compression.ZipFile" version="4.0.1" targetFramework="net462" />
<package id="System.IO.FileSystem" version="4.0.1" targetFramework="net462" />
<package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net462" />
<package id="System.Linq" version="4.1.0" targetFramework="net462" />
<package id="System.Linq.Expressions" version="4.1.0" targetFramework="net462" />
<package id="System.Net.Http" version="4.1.0" targetFramework="net462" />
<package id="System.Net.Primitives" version="4.0.11" targetFramework="net462" />
<package id="System.Net.Sockets" version="4.1.0" targetFramework="net462" />
<package id="System.ObjectModel" version="4.0.12" targetFramework="net462" />
<package id="System.Reflection" version="4.1.0" targetFramework="net462" />
<package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net462" />
<package id="System.Reflection.Primitives" version="4.0.1" targetFramework="net462" />
<package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net462" />
<package id="System.Runtime" version="4.1.0" targetFramework="net462" />
<package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net462" />
<package id="System.Runtime.Handles" version="4.0.1" targetFramework="net462" />
<package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net462" />
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.0.0" targetFramework="net462" />
<package id="System.Runtime.Numerics" version="4.0.1" targetFramework="net462" />
<package id="System.Security.Cryptography.Algorithms" version="4.2.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Encoding" version="4.0.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Primitives" version="4.0.0" targetFramework="net462" />
<package id="System.Security.Cryptography.X509Certificates" version="4.1.0" targetFramework="net462" />
<package id="System.Text.Encoding" version="4.0.11" targetFramework="net462" />
<package id="System.Text.Encoding.Extensions" version="4.0.11" targetFramework="net462" />
<package id="System.Text.RegularExpressions" version="4.1.0" targetFramework="net462" />
<package id="System.Threading" version="4.0.11" targetFramework="net462" />
<package id="System.Threading.Tasks" version="4.0.11" targetFramework="net462" />
<package id="System.Threading.Timer" version="4.0.1" targetFramework="net462" />
<package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="net462" />
<package id="System.Xml.XDocument" version="4.0.11" targetFramework="net462" />
<package id="System.AppContext" version="4.1.0" targetFramework="net452" />
<package id="System.Collections" version="4.0.11" targetFramework="net452" />
<package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net452" />
<package id="System.Console" version="4.0.0" targetFramework="net452" />
<package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net452" />
<package id="System.Diagnostics.DiagnosticSource" version="4.0.0" targetFramework="net452" />
<package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="net452" />
<package id="System.Diagnostics.Tracing" version="4.1.0" targetFramework="net452" />
<package id="System.Globalization" version="4.0.11" targetFramework="net452" />
<package id="System.Globalization.Calendars" version="4.0.1" targetFramework="net452" />
<package id="System.IO" version="4.1.0" targetFramework="net452" />
<package id="System.IO.Compression" version="4.1.0" targetFramework="net452" />
<package id="System.IO.Compression.ZipFile" version="4.0.1" targetFramework="net452" />
<package id="System.IO.FileSystem" version="4.0.1" targetFramework="net452" />
<package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net452" />
<package id="System.Linq" version="4.1.0" targetFramework="net452" />
<package id="System.Linq.Expressions" version="4.1.0" targetFramework="net452" />
<package id="System.Net.Http" version="4.1.0" targetFramework="net452" />
<package id="System.Net.Primitives" version="4.0.11" targetFramework="net452" />
<package id="System.Net.Sockets" version="4.1.0" targetFramework="net452" />
<package id="System.ObjectModel" version="4.0.12" targetFramework="net452" />
<package id="System.Reflection" version="4.1.0" targetFramework="net452" />
<package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net452" />
<package id="System.Reflection.Primitives" version="4.0.1" targetFramework="net452" />
<package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net452" />
<package id="System.Runtime" version="4.1.0" targetFramework="net452" />
<package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net452" />
<package id="System.Runtime.Handles" version="4.0.1" targetFramework="net452" />
<package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net452" />
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.0.0" targetFramework="net452" />
<package id="System.Runtime.Numerics" version="4.0.1" targetFramework="net452" />
<package id="System.Security.Cryptography.Algorithms" version="4.2.0" targetFramework="net452" />
<package id="System.Security.Cryptography.Encoding" version="4.0.0" targetFramework="net452" />
<package id="System.Security.Cryptography.Primitives" version="4.0.0" targetFramework="net452" />
<package id="System.Security.Cryptography.X509Certificates" version="4.1.0" targetFramework="net452" />
<package id="System.Text.Encoding" version="4.0.11" targetFramework="net452" />
<package id="System.Text.Encoding.Extensions" version="4.0.11" targetFramework="net452" />
<package id="System.Text.RegularExpressions" version="4.1.0" targetFramework="net452" />
<package id="System.Threading" version="4.0.11" targetFramework="net452" />
<package id="System.Threading.Tasks" version="4.0.11" targetFramework="net452" />
<package id="System.Threading.Timer" version="4.0.1" targetFramework="net452" />
<package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="net452" />
<package id="System.Xml.XDocument" version="4.0.11" targetFramework="net452" />
</packages>
36 changes: 18 additions & 18 deletions PoGo.NecroBot.ConfigUI/App.config
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="C5" publicKeyToken="282361b99ded7e8e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.4.5947.17248" newVersion="2.4.5947.17248" />
<assemblyIdentity name="C5" publicKeyToken="282361b99ded7e8e" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-2.4.5947.17248" newVersion="2.4.5947.17248"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Extensions" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
<assemblyIdentity name="System.Runtime.Extensions" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.Tracing" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
<assemblyIdentity name="System.Diagnostics.Tracing" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
<assemblyIdentity name="System.Reflection" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
<assemblyIdentity name="System.Runtime.InteropServices" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
6 changes: 4 additions & 2 deletions PoGo.NecroBot.ConfigUI/PoGo.NecroBot.ConfigUI.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PoGo.NecroBot.ConfigUI</RootNamespace>
<AssemblyName>NecroConfig</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
Expand Down Expand Up @@ -183,7 +183,9 @@
<AppDesigner Include="Properties\" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<None Include="App.config">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<Resource Include="Icon.ico" />
Expand Down
42 changes: 17 additions & 25 deletions PoGo.NecroBot.ConfigUI/Properties/Resources.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 9 additions & 13 deletions PoGo.NecroBot.ConfigUI/Properties/Settings.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 4835242

Please sign in to comment.