Updated version.
Updated all packages to latest versions. Updated nuspec for correct project description.
This commit is contained in:
Родитель
85d68da9f5
Коммит
5d1ffd488a
|
@ -72,7 +72,7 @@ namespace DtronixMessageQueue.Tests.Gui.Tests
|
|||
return val;
|
||||
}
|
||||
|
||||
protected override void Send(byte[] buffer, int offset, int count, bool pad)
|
||||
protected override void Send(byte[] buffer, int offset, ushort count, bool pad)
|
||||
{
|
||||
base.Send(buffer, offset, count, pad);
|
||||
Interlocked.Add(ref TotalSent, count);
|
||||
|
|
|
@ -36,8 +36,8 @@
|
|||
<OutputPath>bin\Nuget\</OutputPath>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="protobuf-net, Version=2.3.13.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\protobuf-net.2.3.13\lib\net40\protobuf-net.dll</HintPath>
|
||||
<Reference Include="protobuf-net, Version=2.4.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\protobuf-net.2.4.0\lib\net40\protobuf-net.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Configuration" />
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="protobuf-net" version="2.3.13" targetFramework="net46" />
|
||||
<package id="protobuf-net" version="2.4.0" targetFramework="net46" />
|
||||
</packages>
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\packages\NUnit3TestAdapter.3.10.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.10.0\build\net35\NUnit3TestAdapter.props')" />
|
||||
<Import Project="..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" />
|
||||
<Import Project="..\packages\NUnit3TestAdapter.3.12.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.12.0\build\net35\NUnit3TestAdapter.props')" />
|
||||
<Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
|
@ -43,8 +43,8 @@
|
|||
<OutputPath>bin\Nuget\</OutputPath>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll</HintPath>
|
||||
<Reference Include="nunit.framework, Version=3.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Configuration" />
|
||||
|
@ -109,8 +109,8 @@
|
|||
<PropertyGroup>
|
||||
<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.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.10.1\build\NUnit.props'))" />
|
||||
<Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.10.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.10.0\build\net35\NUnit3TestAdapter.props'))" />
|
||||
<Error Condition="!Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.11.0\build\NUnit.props'))" />
|
||||
<Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.12.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.12.0\build\net35\NUnit3TestAdapter.props'))" />
|
||||
</Target>
|
||||
<!-- 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.
|
||||
|
|
|
@ -2,10 +2,6 @@
|
|||
<configuration>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.2.15.0" newVersion="1.2.15.0"/>
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="NuGet.CommandLine" version="4.6.2" targetFramework="net46" developmentDependency="true" />
|
||||
<package id="NUnit" version="3.10.1" targetFramework="net46" />
|
||||
<package id="NUnit.ConsoleRunner" version="3.8.0" targetFramework="net46" />
|
||||
<package id="NUnit3TestAdapter" version="3.10.0" targetFramework="net46" />
|
||||
<package id="NuGet.CommandLine" version="4.9.2" targetFramework="net46" developmentDependency="true" />
|
||||
<package id="NUnit" version="3.11.0" targetFramework="net46" />
|
||||
<package id="NUnit.ConsoleRunner" version="3.9.0" targetFramework="net46" />
|
||||
<package id="NUnit3TestAdapter" version="3.12.0" targetFramework="net46" />
|
||||
</packages>
|
|
@ -33,8 +33,8 @@
|
|||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="protobuf-net, Version=2.3.13.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\protobuf-net.2.3.13\lib\net40\protobuf-net.dll</HintPath>
|
||||
<Reference Include="protobuf-net, Version=2.4.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\protobuf-net.2.4.0\lib\net40\protobuf-net.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Configuration" />
|
||||
|
@ -79,7 +79,6 @@
|
|||
<Compile Include="Rpc\SerializationCache.cs" />
|
||||
<Compile Include="Rpc\ServiceMethodCache.cs" />
|
||||
<Compile Include="TcpSocket\BufferManager.cs" />
|
||||
<None Include="packages.config" />
|
||||
<Compile Include="TcpSocket\ISetupSocketSession.cs" />
|
||||
<Compile Include="SessionEventArgs.cs" />
|
||||
<Compile Include="SessionClosedEventArgs.cs" />
|
||||
|
@ -105,6 +104,9 @@
|
|||
<Compile Include="MqServer.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Nuget|AnyCPU'">
|
||||
<OutputPath>bin\Nuget\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
|
|
|
@ -9,8 +9,8 @@
|
|||
<licenseUrl>https://raw.githubusercontent.com/Dtronix/DtronixMessageQueue/master/LICENSE</licenseUrl>
|
||||
<projectUrl>https://github.com/Dtronix/DtronixMessageQueue</projectUrl>
|
||||
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||
<description>Simple .net socket message queuing system and Rpc implimentation on top of message queue.</description>
|
||||
<copyright>Copyright 2016</copyright>
|
||||
<tags>message queue mq messagequeue tcp rpc remoting</tags>
|
||||
<description>Simple .net encrypted socket message queuing system and RPC implementation.</description>
|
||||
<copyright>Copyright 2019</copyright>
|
||||
<tags>message queue mq messagequeue tcp rpc remoting encryption aes</tags>
|
||||
</metadata>
|
||||
</package>
|
|
@ -11,7 +11,7 @@ using System.Runtime.InteropServices;
|
|||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("Dtronix")]
|
||||
[assembly: AssemblyProduct("DtronixMessageQueue")]
|
||||
[assembly: AssemblyCopyright("Copyright Dtronix © 2017")]
|
||||
[assembly: AssemblyCopyright("Copyright Dtronix © 2019")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
|
|
|
@ -555,6 +555,10 @@ namespace DtronixMessageQueue.TcpSocket
|
|||
/// <param name="buffer">Buffer bytes to send.</param>
|
||||
/// <param name="offset">Offset in the buffer.</param>
|
||||
/// <param name="count">Total bytes to send.</param>
|
||||
/// <param name="pad">
|
||||
/// Set to true to pad the data in the to the next 16 byte alignment to allow for instant sending.
|
||||
/// Set to false to prevent padding.
|
||||
/// </param>
|
||||
protected virtual void Send(byte[] buffer, int offset, ushort count, bool pad)
|
||||
{
|
||||
if (Socket == null || Socket.Connected == false)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="protobuf-net" version="2.3.13" targetFramework="net46" />
|
||||
<package id="protobuf-net" version="2.4.0" targetFramework="net46" />
|
||||
</packages>
|
Загрузка…
Ссылка в новой задаче