Przeglądaj źródła

升级为core3

old
smallchi 5 lat temu
rodzic
commit
34a1e20b5a
7 zmienionych plików z 17 dodań i 27 usunięć
  1. +4
    -4
      src/JT1078.DotNetty.Core/JT1078.DotNetty.Core.csproj
  2. +0
    -6
      src/JT1078.DotNetty.Http/JT1078.DotNetty.Http.csproj
  3. +0
    -9
      src/JT1078.DotNetty.Tcp/JT1078.DotNetty.Tcp.csproj
  4. +4
    -0
      src/JT1078.DotNetty.TestHosting/Configs/nlog.unix.config
  5. +7
    -7
      src/JT1078.DotNetty.TestHosting/JT1078.DotNetty.TestHosting.csproj
  6. +2
    -1
      src/JT1078.DotNetty.TestHosting/JT1078WSFlv/JT1078WSFlvHostedService.cs
  7. BIN
      src/JT1078.DotNetty.TestHosting/dll/JT1078.Flv.dll

+ 4
- 4
src/JT1078.DotNetty.Core/JT1078.DotNetty.Core.csproj Wyświetl plik

@@ -25,11 +25,11 @@
<PackageReference Include="DotNetty.Transport.Libuv" Version="0.6.0" />
<PackageReference Include="DotNetty.Codecs" Version="0.6.0" />
<PackageReference Include="JT1078" Version="1.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="3.0.0" />
</ItemGroup>

<ItemGroup>


+ 0
- 6
src/JT1078.DotNetty.Http/JT1078.DotNetty.Http.csproj Wyświetl plik

@@ -20,12 +20,6 @@
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\LICENSE" Pack="true" PackagePath="" />
</ItemGroup>


+ 0
- 9
src/JT1078.DotNetty.Tcp/JT1078.DotNetty.Tcp.csproj Wyświetl plik

@@ -27,13 +27,4 @@
<None Include="..\..\LICENSE" Pack="true" PackagePath="" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="DotNetty.Handlers" Version="0.6.0" />
<PackageReference Include="DotNetty.Transport.Libuv" Version="0.6.0" />
<PackageReference Include="DotNetty.Codecs" Version="0.6.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0" />
</ItemGroup>
</Project>

+ 4
- 0
src/JT1078.DotNetty.TestHosting/Configs/nlog.unix.config Wyświetl plik

@@ -29,6 +29,9 @@
<target name="JT1078TcpMessageHandlersHex" xsi:type="File"
fileName="${Directory}/JT1078TcpMessageHandlersHex/${shortdate}.log"
layout="${date:format=yyyyMMddHHmmss},${message}"/>
<target name="FlvEncoder" xsi:type="File"
fileName="${Directory}/FlvEncoder/${shortdate}.log"
layout="${date:format=yyyyMMddHHmmss},${message}"/>
<target name="JT1078TcpConnectionHandler" xsi:type="File"
fileName="${Directory}/JT1078TcpConnectionHandler/${shortdate}.log"
layout="${date:format=yyyyMMddHHmmss},${message}"/>
@@ -48,5 +51,6 @@
<logger name="JT1078.DotNetty.Tcp.Handlers.JT1078TcpConnectionHandler" minlevel="Debug" maxlevel="Fatal" writeTo="JT1078TcpConnectionHandler,console"/>
<logger name="JT1078TcpMessageHandlers" minlevel="Debug" maxlevel="Fatal" writeTo="JT1078TcpMessageHandlers"/>
<logger name="JT1078TcpMessageHandlersHex" minlevel="Debug" maxlevel="Fatal" writeTo="JT1078TcpMessageHandlersHex"/>
<logger name="FlvEncoder" minlevel="Debug" maxlevel="Fatal" writeTo="FlvEncoder"/>
</rules>
</nlog>

+ 7
- 7
src/JT1078.DotNetty.TestHosting/JT1078.DotNetty.TestHosting.csproj Wyświetl plik

@@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
@@ -10,12 +10,12 @@
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.2.0" />
<PackageReference Include="NLog.Extensions.Logging" Version="1.5.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.0.0" />
<PackageReference Include="NLog.Extensions.Logging" Version="1.6.0" />
</ItemGroup>




+ 2
- 1
src/JT1078.DotNetty.TestHosting/JT1078WSFlv/JT1078WSFlvHostedService.cs Wyświetl plik

@@ -33,7 +33,7 @@ namespace JT1078.DotNetty.TestHosting
private ConcurrentDictionary<string, byte> exists = new ConcurrentDictionary<string, byte>();

private readonly JT1078WSFlvDataService jT1078WSFlvDataService;
private readonly FlvEncoder FlvEncoder = new FlvEncoder();
private readonly FlvEncoder FlvEncoder;
private readonly ILogger logger;
private readonly ILogger flvEncodingLogger;
public JT1078WSFlvHostedService(
@@ -45,6 +45,7 @@ namespace JT1078.DotNetty.TestHosting
flvEncodingLogger = loggerFactory.CreateLogger("FlvEncoding");
this.jT1078WSFlvDataService = jT1078WSFlvDataServic;
this.jT1078HttpSessionManager = jT1078HttpSessionManager;
FlvEncoder = new FlvEncoder(loggerFactory);
}

public Task StartAsync(CancellationToken cancellationToken)


BIN
src/JT1078.DotNetty.TestHosting/dll/JT1078.Flv.dll Wyświetl plik


Ładowanie…
Anuluj
Zapisz