diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index ab72470..ec16bfc 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -12,7 +12,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@master with: - dotnet-version: 6.0.201 + dotnet-version: 6.0.400 - name: dotnet info run: dotnet --info - name: dotnet restore diff --git a/global.json b/global.json index 726ce1b..d769cd3 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "6.0.201" + "version": "6.0.400" } } \ No newline at end of file diff --git a/src/Info.props b/src/Info.props index 71abdbe..1560f27 100644 --- a/src/Info.props +++ b/src/Info.props @@ -1,6 +1,6 @@  - netstandard2.0;netstandard2.1;net5.0;net6.0 + net6.0 10.0 Copyright 2018. SmallChi(Koike) @@ -8,7 +8,7 @@ https://github.com/SmallChi/JT809 https://github.com/SmallChi/JT809/blob/master/LICENSE https://github.com/SmallChi/JT809/blob/master/LICENSE - 2.2.1 + 2.2.2 LICENSE true latest diff --git a/src/JT809.Protocol.Benchmark/JT809.Protocol.Benchmark.csproj b/src/JT809.Protocol.Benchmark/JT809.Protocol.Benchmark.csproj index 5688656..2c3bbef 100644 --- a/src/JT809.Protocol.Benchmark/JT809.Protocol.Benchmark.csproj +++ b/src/JT809.Protocol.Benchmark/JT809.Protocol.Benchmark.csproj @@ -6,9 +6,9 @@ - + - + diff --git a/src/JT809.Protocol.Extensions/JT809.Protocol.Extensions.JT1078.Test/JT809.Protocol.Extensions.JT1078.Test.csproj b/src/JT809.Protocol.Extensions/JT809.Protocol.Extensions.JT1078.Test/JT809.Protocol.Extensions.JT1078.Test.csproj index 745e11f..e3d3592 100644 --- a/src/JT809.Protocol.Extensions/JT809.Protocol.Extensions.JT1078.Test/JT809.Protocol.Extensions.JT1078.Test.csproj +++ b/src/JT809.Protocol.Extensions/JT809.Protocol.Extensions.JT1078.Test/JT809.Protocol.Extensions.JT1078.Test.csproj @@ -5,10 +5,10 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/JT809.Protocol.Test/JT809.Protocol.Test.csproj b/src/JT809.Protocol.Test/JT809.Protocol.Test.csproj index 0fa106b..4a956c7 100644 --- a/src/JT809.Protocol.Test/JT809.Protocol.Test.csproj +++ b/src/JT809.Protocol.Test/JT809.Protocol.Test.csproj @@ -11,11 +11,11 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers diff --git a/src/JT809.Protocol.sln b/src/JT809.Protocol.sln index adfe267..fbb5804 100644 --- a/src/JT809.Protocol.sln +++ b/src/JT809.Protocol.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28407.52 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32825.248 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JT809.Protocol", "JT809.Protocol\JT809.Protocol.csproj", "{4D33A5C9-F583-4230-9791-AB0394EFAD57}" EndProject @@ -18,6 +18,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{63D43A33-9CD2-4487-803E-51CA61BB7A5A}" ProjectSection(SolutionItems) = preProject ..\.github\workflows\dotnetcore.yml = ..\.github\workflows\dotnetcore.yml + ..\global.json = ..\global.json Info.props = Info.props ..\LICENSE = ..\LICENSE EndProjectSection diff --git a/src/JT809.Protocol/JT809.Protocol.csproj b/src/JT809.Protocol/JT809.Protocol.csproj index b3d37d8..405cf28 100644 --- a/src/JT809.Protocol/JT809.Protocol.csproj +++ b/src/JT809.Protocol/JT809.Protocol.csproj @@ -10,14 +10,6 @@ 1701;1702;1591 - - true - - - - true - - @@ -88,33 +80,10 @@ - - - - - - - - - - - - - - + - - - - - - - - - -