Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@guFalcon
guFalcon committed Feb 10, 2020
2 parents 4c4c419 + 951b956 commit 6b489cd
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 39 deletions.
52 changes: 48 additions & 4 deletions NexusClient/HandlerTests/HandlerTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,64 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="MessagePack, Version=2.1.0.0, Culture=neutral, PublicKeyToken=b4a0369545f0a1be, processorArchitecture=MSIL">
<HintPath>..\packages\MessagePack.2.1.80\lib\netstandard2.0\MessagePack.dll</HintPath>
</Reference>
<Reference Include="MessagePack.Annotations, Version=2.1.0.0, Culture=neutral, PublicKeyToken=b4a0369545f0a1be, processorArchitecture=MSIL">
<HintPath>..\packages\MessagePack.Annotations.2.1.80\lib\netstandard2.0\MessagePack.Annotations.dll</HintPath>
</Reference>
<Reference Include="MessagePack.ImmutableCollection, Version=2.1.0.0, Culture=neutral, PublicKeyToken=b4a0369545f0a1be, processorArchitecture=MSIL">
<HintPath>..\packages\MessagePack.ImmutableCollection.2.1.80\lib\netstandard2.0\MessagePack.ImmutableCollection.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualStudio.Threading, Version=16.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.VisualStudio.Threading.16.5.124-alpha\lib\netstandard2.0\Microsoft.VisualStudio.Threading.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.Validation, Version=15.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.VisualStudio.Validation.15.5.31\lib\netstandard2.0\Microsoft.VisualStudio.Validation.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Win32.Registry, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Win32.Registry.4.7.0\lib\net461\Microsoft.Win32.Registry.dll</HintPath>
</Reference>
<Reference Include="MonoGame.Framework, Version=3.7.1.189, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MonoGame.Framework.DesktopGL.3.7.1.189\lib\net45\MonoGame.Framework.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<HintPath>..\packages\Serilog.2.9.1-dev-01154\lib\net45\Serilog.dll</HintPath>
</Reference>
<Reference Include="Serilog.Sinks.Console, Version=4.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<HintPath>..\packages\Serilog.Sinks.Console.4.0.0-dev-00839\lib\net45\Serilog.Sinks.Console.dll</HintPath>
<HintPath>..\packages\Serilog.2.9.1-dev-01154\lib\net46\Serilog.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Collections.Immutable.1.7.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.6.0-preview5.19224.8\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Security.AccessControl, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.AccessControl.4.7.0\lib\net461\System.Security.AccessControl.dll</HintPath>
</Reference>
<Reference Include="System.Security.Principal.Windows, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Principal.Windows.4.7.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.6.0-preview.18571.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
Expand Down
22 changes: 19 additions & 3 deletions NexusClient/HandlerTests/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MessagePack" version="2.1.80" targetFramework="net471" />
<package id="MessagePack.Annotations" version="2.1.80" targetFramework="net471" />
<package id="MessagePack.ImmutableCollection" version="2.1.80" targetFramework="net471" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.1.0" targetFramework="net471" />
<package id="Microsoft.VisualStudio.Threading" version="16.5.124-alpha" targetFramework="net471" />
<package id="Microsoft.VisualStudio.Validation" version="15.5.31" targetFramework="net471" />
<package id="Microsoft.Win32.Registry" version="4.7.0" targetFramework="net471" />
<package id="MonoGame.Framework.DesktopGL" version="3.7.1.189" targetFramework="net471" />
<package id="NUnit" version="3.12.0" targetFramework="net45" />
<package id="Serilog" version="2.9.1-dev-01154" targetFramework="net45" requireReinstallation="true" />
<package id="Serilog.Sinks.Console" version="4.0.0-dev-00839" targetFramework="net471" />
<package id="NUnit" version="3.12.0" targetFramework="net471" />
<package id="Serilog" version="2.9.1-dev-01154" targetFramework="net471" />
<package id="System.Buffers" version="4.5.0" targetFramework="net471" />
<package id="System.Collections.Immutable" version="1.7.0" targetFramework="net471" />
<package id="System.Memory" version="4.5.3" targetFramework="net471" />
<package id="System.Numerics.Vectors" version="4.6.0-preview5.19224.8" targetFramework="net471" />
<package id="System.Reflection.Emit" version="4.7.0" targetFramework="net471" />
<package id="System.Reflection.Emit.Lightweight" version="4.7.0" targetFramework="net471" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.0" targetFramework="net471" />
<package id="System.Security.AccessControl" version="4.7.0" targetFramework="net471" />
<package id="System.Security.Principal.Windows" version="4.7.0" targetFramework="net471" />
<package id="System.Threading.Tasks.Extensions" version="4.6.0-preview.18571.3" targetFramework="net471" />
</packages>
25 changes: 2 additions & 23 deletions NexusClient/NexusClient/NexusClient.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@
<Reference Include="AutoMapper, Version=9.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
<HintPath>..\packages\AutoMapper.9.0.0\lib\net461\AutoMapper.dll</HintPath>
</Reference>
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>
</Reference>
<Reference Include="Faders, Version=1.1.1.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Faders.1.1.1.1\lib\portable45-net45+win8+wpa81\Faders.dll</HintPath>
</Reference>
Expand All @@ -56,7 +53,7 @@
<HintPath>..\packages\MessagePack.ImmutableCollection.2.1.80\lib\netstandard2.0\MessagePack.ImmutableCollection.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.Threading, Version=16.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.VisualStudio.Threading.16.5.124-alpha\lib\netstandard2.0\Microsoft.VisualStudio.Threading.dll</HintPath>
Expand All @@ -70,9 +67,6 @@
<Reference Include="MonoGame.Framework, Version=3.7.1.189, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MonoGame.Framework.Portable.3.7.1.189\lib\portable-net45+win8+wpa81\MonoGame.Framework.dll</HintPath>
</Reference>
<Reference Include="Moq, Version=4.13.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\packages\Moq.4.13.1\lib\net45\Moq.dll</HintPath>
</Reference>
<Reference Include="Nerdbank.Streams, Version=2.5.0.0, Culture=neutral, PublicKeyToken=cac503e1823ce71c, processorArchitecture=MSIL">
<HintPath>..\packages\Nerdbank.Streams.2.5.19-alpha\lib\netstandard2.0\Nerdbank.Streams.dll</HintPath>
</Reference>
Expand All @@ -91,9 +85,6 @@
<Reference Include="Serilog.Sinks.File, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<HintPath>..\packages\Serilog.Sinks.File.5.0.0-dev-00864\lib\net45\Serilog.Sinks.File.dll</HintPath>
</Reference>
<Reference Include="StateMachine, Version=1.2.0.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\StateMachine.1.2.4\lib\portable45-net45+win8+wpa81\StateMachine.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
Expand Down Expand Up @@ -122,11 +113,6 @@
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Runtime.Serialization.Primitives, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.Serialization.Primitives.4.3.0\lib\net46\System.Runtime.Serialization.Primitives.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Security.AccessControl, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.AccessControl.4.7.0\lib\net461\System.Security.AccessControl.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -233,13 +219,8 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
<AdditionalFiles Include="ZeroFormatterAnalyzer.json" />
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\MessagePackAnalyzer.2.1.80\analyzers\dotnet\MessagePackAnalyzer.dll" />
<Analyzer Include="..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.5.124-alpha\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes.dll" />
<Analyzer Include="..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.5.124-alpha\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.dll" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand All @@ -248,9 +229,7 @@
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" />
<Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.5.124-alpha\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.5.124-alpha\build\Microsoft.VisualStudio.Threading.Analyzers.targets'))" />
</Target>
<Import Project="..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.5.124-alpha\build\Microsoft.VisualStudio.Threading.Analyzers.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.5.124-alpha\build\Microsoft.VisualStudio.Threading.Analyzers.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.
<Target Name="BeforeBuild">
Expand Down
12 changes: 3 additions & 9 deletions NexusClient/NexusClient/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AutoMapper" version="9.0.0" targetFramework="net471" />
<package id="Castle.Core" version="4.4.0" targetFramework="net471" />
<package id="Faders" version="1.1.1.1" targetFramework="net471" />
<package id="GameTimers" version="1.0.3.1" targetFramework="net471" />
<package id="JetBrains.Annotations" version="2019.1.3" targetFramework="net45" />
<package id="JetBrains.Annotations" version="2019.1.3" targetFramework="net471" />
<package id="MessagePack" version="2.1.80" targetFramework="net471" />
<package id="MessagePack.Annotations" version="2.1.80" targetFramework="net471" />
<package id="MessagePack.ImmutableCollection" version="2.1.80" targetFramework="net471" />
<package id="MessagePackAnalyzer" version="2.1.80" targetFramework="net471" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net471" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.1.0" targetFramework="net471" />
<package id="Microsoft.VisualStudio.Threading" version="16.5.124-alpha" targetFramework="net471" />
<package id="Microsoft.VisualStudio.Threading.Analyzers" version="16.5.124-alpha" targetFramework="net471" />
<package id="Microsoft.VisualStudio.Validation" version="15.5.31" targetFramework="net471" />
<package id="Microsoft.Win32.Registry" version="4.7.0" targetFramework="net471" />
<package id="MonoGame.Framework.Portable" version="3.7.1.189" targetFramework="net471" />
<package id="Moq" version="4.13.1" targetFramework="net471" />
<package id="Nerdbank.Streams" version="2.5.19-alpha" targetFramework="net471" />
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net471" />
<package id="NUnit" version="3.12.0" targetFramework="net45" />
<package id="NUnit" version="3.12.0" targetFramework="net471" />
<package id="Serilog" version="2.9.1-dev-01154" targetFramework="net471" />
<package id="Serilog.Sinks.Console" version="4.0.0-dev-00839" targetFramework="net471" />
<package id="Serilog.Sinks.File" version="5.0.0-dev-00864" targetFramework="net471" />
<package id="StateMachine" version="1.2.4" targetFramework="net471" />
<package id="System.Buffers" version="4.5.0" targetFramework="net471" />
<package id="System.Collections.Immutable" version="1.7.0" targetFramework="net471" />
<package id="System.IO.Pipelines" version="4.7.0" targetFramework="net471" />
Expand All @@ -32,7 +27,6 @@
<package id="System.Reflection.Emit" version="4.7.0" targetFramework="net471" />
<package id="System.Reflection.Emit.Lightweight" version="4.7.0" targetFramework="net471" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.0" targetFramework="net471" />
<package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net471" />
<package id="System.Security.AccessControl" version="4.7.0" targetFramework="net471" />
<package id="System.Security.Principal.Windows" version="4.7.0" targetFramework="net471" />
<package id="System.Threading.Tasks.Extensions" version="4.6.0-preview.18571.3" targetFramework="net471" />
Expand Down

0 comments on commit 6b489cd

Please sign in to comment.