Skip to content

Commit 3c8b0eb

Browse files
authored
Merge pull request #15 from progaudi/v2.0.0
v2.0.0
2 parents d3c6c94 + c5323f1 commit 3c8b0eb

36 files changed

+340
-299
lines changed

.appveyor.yml

Lines changed: 0 additions & 65 deletions
This file was deleted.

.azure/test.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
parameters:
2+
path: ''
3+
framework: ''
4+
frameworkGlobal: true
5+
6+
steps:
7+
- ${{ if eq(parameters.frameworkGlobal, 'false') }}:
8+
- script: ${{ format('/home/vsts/.dotnet/dotnet test -f {0} --no-build --logger trx -c Release {1}', parameters.framework, parameters.path) }}
9+
displayName: ${{ format('dotnet test -f {0}', parameters.framework) }}
10+
11+
- ${{ if eq(parameters.frameworkGlobal, 'true') }}:
12+
- task: DotNetCoreCLI@2
13+
displayName: ${{ format('dotnet test -f {0}', parameters.framework) }}
14+
inputs:
15+
command: test
16+
projects: ${{ parameters.path }}
17+
arguments: ${{ format('--no-build -f {0} -c Release', parameters.framework) }}
18+
publishTestResults: true

.azure/tests.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
parameters:
2+
netcore1Global: true
3+
4+
steps:
5+
- task: DotNetCoreCLI@2
6+
displayName: dotnet build
7+
inputs:
8+
command: build
9+
projects: msgpack.spec.sln
10+
arguments: -c Release
11+
verbosityRestore: minimal
12+
13+
- template: test.yml
14+
parameters:
15+
path: tests/msgpack.spec.tests/msgpack.spec.tests.csproj
16+
framework: netcoreapp1.0
17+
frameworkGlobal: ${{ parameters.netcore1Global }}
18+
19+
- template: test.yml
20+
parameters:
21+
path: tests/msgpack.spec.tests/msgpack.spec.tests.csproj
22+
framework: netcoreapp1.1
23+
frameworkGlobal: ${{ parameters.netcore1Global }}
24+
25+
- template: test.yml
26+
parameters:
27+
path: tests/msgpack.spec.tests/msgpack.spec.tests.csproj
28+
framework: netcoreapp2.0
29+
30+
- template: test.yml
31+
parameters:
32+
path: tests/msgpack.spec.tests/msgpack.spec.tests.csproj
33+
framework: netcoreapp2.1

.travis.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

Dockerfile

Lines changed: 0 additions & 18 deletions
This file was deleted.

azure-pipelines.yml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
jobs:
2+
- job: macOs
3+
pool:
4+
name: Hosted macOS
5+
steps:
6+
- template: .azure/tests.yml
7+
8+
- job: linux
9+
pool:
10+
name: Hosted Ubuntu 1604
11+
steps:
12+
- script: curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin -channel 1.1
13+
displayName: Installing .netcore 1.1
14+
- template: .azure/tests.yml
15+
parameters:
16+
netcore1Global: false
17+
18+
- job: win
19+
dependsOn:
20+
- macOs
21+
- linux
22+
pool:
23+
name: Hosted VS2017
24+
steps:
25+
- template: .azure/tests.yml
26+
- template: .azure/test.yml
27+
parameters:
28+
path: tests/msgpack.spec.tests/msgpack.spec.tests.csproj
29+
framework: net46
30+
31+
- task: PowerShell@2
32+
displayName: pack nuget package
33+
inputs:
34+
targetType: inline
35+
script: |
36+
$version = $(git describe --tags | %{$_ -replace '-([^g])', '.$1'})
37+
dotnet pack --no-build -v minimal -c Release /property:Version=$version /property:PackageOutputPath=$(Build.ArtifactStagingDirectory)
38+
39+
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
40+
- task: NuGetCommand@2
41+
displayName: push nuget packages
42+
inputs:
43+
command: push
44+
packagesToPush: '$(Build.ArtifactStagingDirectory)/*.nupkg'
45+
nuGetFeedType: external
46+
publishFeedCredentials: api.nuget.org
47+
48+
- task: PublishBuildArtifacts@1
49+
inputs:
50+
pathtoPublish: '$(Build.ArtifactStagingDirectory)'
51+
artifactName: .nupkgs

benchmarks/msgpack.spec.linux/msgpack.spec.linux.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<IsPackable>false</IsPackable>
88
</PropertyGroup>
99
<ItemGroup>
10-
<PackageReference Include="BenchmarkDotNet" Version="0.11.0" />
10+
<PackageReference Include="BenchmarkDotNet" Version="0.11.1" />
1111
<PackageReference Include="MessagePack" Version="1.7.3.4" />
1212
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
13-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.1" />
13+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
1414
</ItemGroup>
1515
<ItemGroup>
1616
<ProjectReference Include="..\..\src\msgpack.spec\msgpack.spec.csproj" />

global.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

scripts/.travis.sdk1.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

scripts/.travis.sdk2.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

scripts/set-version.ps1

Lines changed: 0 additions & 2 deletions
This file was deleted.

src/msgpack.spec/DataCodes.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,12 @@ public static class DataCodes
77

88
public const byte FixMapMin = 0x80;
99
public const byte FixMapMax = 0x8f;
10-
public const byte FixMapMaxLength = FixMapMax - FixMapMin;
1110

1211
public const byte FixArrayMin = 0x90;
1312
public const byte FixArrayMax = 0x9f;
14-
public const byte FixArrayMaxLength = FixArrayMax - FixArrayMin;
1513

1614
public const byte FixStringMin = 0xa0;
1715
public const byte FixStringMax = 0xbf;
18-
public const byte FixStringMaxLength = FixStringMax - FixStringMin;
1916

2017
public const byte Nil = 0xc0;
2118

src/msgpack.spec/DataLengths.cs

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
namespace ProGaudi.MsgPack
2+
{
3+
public static class DataLengths
4+
{
5+
public const int FixArrayHeader = 1;
6+
public const int Array16Header = 3;
7+
public const int Array32Header = 5;
8+
public const int Binary8Header = 2;
9+
public const int Binary16Header = 3;
10+
public const int Binary32Header = 5;
11+
public const int Boolean = 1;
12+
public const int Float64 = 9;
13+
public const int Extension8Header = 3;
14+
public const int Extension16Header = 4;
15+
public const int Extension32Header = 6;
16+
public const int FixExtensionHeader = 2;
17+
public const int TimeStamp32 = 6;
18+
public const int TimeStamp64 = 10;
19+
public const int TimeStamp96 = 15;
20+
public const int Float32 = 5;
21+
public const int Int16 = 3;
22+
public const int Int32 = 5;
23+
public const int Int64 = 9;
24+
public const int Int8 = 2;
25+
public const int FixMapHeader = 1;
26+
public const int Map16Header = 3;
27+
public const int Map32Header = 5;
28+
public const int NegativeFixInt = 1;
29+
public const int Nil = 1;
30+
public const int PositiveFixInt = 1;
31+
public const int FixStringHeader = 1;
32+
public const int String8Header = 2;
33+
public const int String16Header = 3;
34+
public const int String32Header = 5;
35+
public const int UInt8 = 2;
36+
public const int UInt16 = 3;
37+
public const int UInt32 = 5;
38+
public const int UInt64 = 9;
39+
40+
public const byte FixMapMaxLength = DataCodes.FixMapMax - DataCodes.FixMapMin;
41+
public const byte FixArrayMaxLength = DataCodes.FixArrayMax - DataCodes.FixArrayMin;
42+
public const byte FixStringMaxLength = DataCodes.FixStringMax - DataCodes.FixStringMin;
43+
}
44+
}

0 commit comments

Comments
 (0)