From 30c86868f0a79513526bee00a102439c2ff76799 Mon Sep 17 00:00:00 2001
From: "smallchi(Koike)" <564952747@qq.com>
Date: Tue, 28 Jan 2020 23:38:01 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=8E=BB=E6=8E=89travis=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E7=94=A8Actions=E9=85=8D=E7=BD=AE=202.?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7808=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/dotnetcore.yml              | 25 +++++++++++++++++++
 .travis.yml                                   | 17 -------------
 README.md                                     |  4 +--
 ...ocol.Extensions.JTActiveSafety.Test.csproj | 11 +++++---
 ....Protocol.Extensions.JTActiveSafety.csproj |  4 +--
 .../JTActiveSafety.Protocol.csproj            |  6 ++---
 6 files changed, 39 insertions(+), 28 deletions(-)
 create mode 100644 .github/workflows/dotnetcore.yml
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
new file mode 100644
index 0000000..f23939b
--- /dev/null
+++ b/.github/workflows/dotnetcore.yml
@@ -0,0 +1,25 @@
+name: .NET Core
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@master
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@master
+      with:
+        dotnet-version: 3.1.101
+    - name: dotnet info
+      run: dotnet --info
+    - name: dotnet restore
+      run: dotnet restore ./src/JTActiveSafety.sln
+    - name: dotnet JTActiveSafety.Protocol build
+      run: dotnet build ./src/JTActiveSafety.Protocol.Test/JTActiveSafety.Protocol.Test.csproj
+    - name: dotnet JT808.Protocol.Extensions.JTActiveSafety build
+      run: dotnet test ./src/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808.Protocol.Extensions.JTActiveSafety.Test.csproj
+    - name: dotnet JT808.Protocol.Extensions.JTActiveSafety test
+      run: dotnet test ./src/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808.Protocol.Extensions.JTActiveSafety.Test.csproj
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 18991a2..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-language: csharp
-solution: JTActiveSafety.sln
-dotnet: 3.1.100
-os: linux
-mono: none
-dist: trusty2
-script:
- - dotnet restore src/JTActiveSafety.sln
- - dotnet build src/JTActiveSafety.Protocol.Test/JTActiveSafety.Protocol.Test.csproj
- - dotnet test src/JTActiveSafety.Protocol.Test/JTActiveSafety.Protocol.Test.csproj
- - dotnet build src/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808.Protocol.Extensions.JTActiveSafety.Test.csproj
- - dotnet test src/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808.Protocol.Extensions.JTActiveSafety.Test.csproj
-after_success:
- - echo successful build!
-branches:
-  only:
-    - master
diff --git a/README.md b/README.md
index 66a5f4a..b3c278b 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ JTActiveSafety协议、道路运输车辆主动安全智能防控系统-主动
 1. 设备终端到平台的通信也就是JT808
 2. 设备终端上传的附件数据也就是附件服务器
 
-[![MIT Licence](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/SmallChi/JTActiveSafety/blob/master/LICENSE)[![Build Status](https://travis-ci.org/SmallChi/JTActiveSafety.svg?branch=master)](https://travis-ci.org/SmallChi/JTActiveSafety)
+[![MIT Licence](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/SmallChi/JTActiveSafety/blob/master/LICENSE)[![Github Build status](https://github.com/SmallChi/JTActiveSafety/workflows/.NET%20Core/badge.svg)]()
 
 ## 基于JT808扩展的JTActiveSafety消息协议
 
@@ -44,4 +44,4 @@ JTActiveSafety协议、道路运输车辆主动安全智能防控系统-主动
 IServiceCollection serviceDescriptors1 = new ServiceCollection();
 serviceDescriptors1.AddJT808Configure()
                    .AddJTActiveSafetyConfigure();
-```
\ No newline at end of file
+```
diff --git a/src/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808.Protocol.Extensions.JTActiveSafety.Test.csproj b/src/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808.Protocol.Extensions.JTActiveSafety.Test.csproj
index e812d17..c74f165 100644
--- a/src/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808.Protocol.Extensions.JTActiveSafety.Test.csproj
+++ b/src/JT808.Protocol.Extensions.JTActiveSafety.Test/JT808.Protocol.Extensions.JTActiveSafety.Test.csproj
@@ -7,10 +7,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/JT808.Protocol.Extensions.JTActiveSafety/JT808.Protocol.Extensions.JTActiveSafety.csproj b/src/JT808.Protocol.Extensions.JTActiveSafety/JT808.Protocol.Extensions.JTActiveSafety.csproj
index 3c8557c..6dcc138 100644
--- a/src/JT808.Protocol.Extensions.JTActiveSafety/JT808.Protocol.Extensions.JTActiveSafety.csproj
+++ b/src/JT808.Protocol.Extensions.JTActiveSafety/JT808.Protocol.Extensions.JTActiveSafety.csproj
@@ -15,7 +15,7 @@
     <licenseUrl>https://github.com/SmallChi/JTActiveSafety/blob/master/LICENSE</licenseUrl>
     <license>https://github.com/SmallChi/JTActiveSafety/blob/master/LICENSE</license>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <Version>1.0.0</Version>
+    <Version>1.0.1</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
   </PropertyGroup>
 
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JT808" Version="2.2.5" />
+    <PackageReference Include="JT808" Version="2.2.6" />
   </ItemGroup>
 
 
diff --git a/src/JTActiveSafety.Protocol/JTActiveSafety.Protocol.csproj b/src/JTActiveSafety.Protocol/JTActiveSafety.Protocol.csproj
index f1ab155..57c943e 100644
--- a/src/JTActiveSafety.Protocol/JTActiveSafety.Protocol.csproj
+++ b/src/JTActiveSafety.Protocol/JTActiveSafety.Protocol.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;</TargetFrameworks>
+    <LangVersion>8.0</LangVersion>
     <Copyright>Copyright 2019.</Copyright>
     <Authors>SmallChi(Koike)</Authors>
     <PackageId>JTActiveSafety</PackageId>
@@ -18,7 +18,7 @@
     <Version>1.0.0</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
   </PropertyGroup>
-  <ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="System.Memory" Version="4.5.3" />
   </ItemGroup>
   <ItemGroup>