Skip to content

Commit b1856f7

Browse files
authored
Merge pull request #137 from progaudi/binary-compatibility-mode
Binary compatibility mode
2 parents 3c8779c + 5489590 commit b1856f7

19 files changed

+117
-175
lines changed

.azure/test.yml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+
nobuild: true
17+
projects: ${{ parameters.path }}
18+
arguments: ${{ format(' -f {0} -c Release', parameters.framework) }}
19+
publishTestResults: true

.azure/tests.yml

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
parameters:
2+
netcore1Global: true
3+
4+
steps:
5+
- task: DotNetCoreCLI@2
6+
displayName: dotnet build
7+
inputs:
8+
command: build
9+
projects: progaudi.tarantool.sln
10+
arguments: -c Release
11+
verbosityRestore: minimal
12+
13+
- task: Bash@3
14+
displayName: set version variable
15+
inputs:
16+
targetType: inline
17+
script: echo "##vso[task.setvariable variable=NugetPackageVersion]$(git describe --tags | sed 's/-/./')"
18+
19+
- task: DotNetCoreCLI@2
20+
displayName: pack nuget package
21+
inputs:
22+
command: pack
23+
versioningScheme: byEnvVar
24+
versionEnvVar: NugetPackageVersion
25+
arguments: --no-build -c Release /property:PackageOutputPath=$(Build.ArtifactStagingDirectory)
26+
verbosityPack: minimal
27+
28+
- task: Bash@3
29+
inputs:
30+
targetType: inline
31+
script: docker-compose up -d
32+
33+
- template: test.yml
34+
parameters:
35+
path: tests/progaudi.tarantool.tests/progaudi.tarantool.tests.csproj
36+
framework: netcoreapp1.0
37+
frameworkGlobal: ${{ parameters.netcore1Global }}
38+
39+
- template: test.yml
40+
parameters:
41+
path: tests/progaudi.tarantool.tests/progaudi.tarantool.tests.csproj
42+
framework: netcoreapp1.1
43+
frameworkGlobal: ${{ parameters.netcore1Global }}
44+
45+
- template: test.yml
46+
parameters:
47+
path: tests/progaudi.tarantool.tests/progaudi.tarantool.tests.csproj
48+
framework: netcoreapp2.0

.travis.yml

-27
This file was deleted.

Scripts/set-dotnet-core-version-variable.ps1

-4
This file was deleted.

azure-pipelines.yml

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
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+
27+
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
28+
- task: NuGetCommand@2
29+
displayName: push nuget packages
30+
inputs:
31+
command: push
32+
packagesToPush: '$(Build.ArtifactStagingDirectory)/*.nupkg'
33+
nuGetFeedType: external
34+
publishFeedCredentials: api.nuget.org
35+
36+
- task: PublishBuildArtifacts@1
37+
inputs:
38+
pathtoPublish: '$(Build.ArtifactStagingDirectory)'
39+
artifactName: nupkgs

global.json

-5
This file was deleted.

progaudi.tarantool.sln

-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ EndProject
88
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "progaudi.tarantool.tests", "tests\progaudi.tarantool.tests\progaudi.tarantool.tests.csproj", "{4C681801-9A6B-4CE9-8EAA-23F80917F046}"
99
EndProject
1010
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{14BAEDF1-BEFC-4FB2-AAC9-08D397191216}"
11-
ProjectSection(SolutionItems) = preProject
12-
global.json = global.json
13-
EndProjectSection
1411
EndProject
1512
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "progaudi.tarantool.benchmark", "src\progaudi.tarantool.benchmark\progaudi.tarantool.benchmark.csproj", "{CD96AC2D-505F-4FDF-82FB-76F51CC28FF4}"
1613
EndProject

scripts/build-netcore.sh

-9
This file was deleted.

scripts/dotnet-install.sh

-8
This file was deleted.

scripts/if_there_are_changes_in.sh

-59
This file was deleted.

scripts/linux-test-netcore.sh

-9
This file was deleted.

scripts/mac-prereqs.sh

-13
This file was deleted.

scripts/mac-test-netcore.sh

-7
This file was deleted.

scripts/publish-nuget.sh

-8
This file was deleted.

scripts/ubuntu-prereqs.sh

-16
This file was deleted.

src/progaudi.tarantool.benchmark/progaudi.tarantool.benchmark.csproj

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
<AssemblyName>progaudi.tarantool.benchmark</AssemblyName>
99
<RootNamespace>ProGaudi.Tarantool.Benchmark</RootNamespace>
10+
11+
<IsPackable>false</IsPackable>
1012
</PropertyGroup>
1113

1214
<ItemGroup>

src/progaudi.tarantool/Model/ClientOptions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public ClientOptions(string replicationSource, ILog log = null, MsgPackContext c
1717
private ClientOptions(ConnectionOptions options, ILog log, MsgPackContext context)
1818
{
1919
ConnectionOptions = options;
20-
MsgPackContext = context ?? new MsgPackContext();
20+
MsgPackContext = context ?? new MsgPackContext(binaryCompatibilityMode: true);
2121
if (log != null)
2222
{
2323
LogWriter = new LogWriterWrapper(this, log);

src/progaudi.tarantool/progaudi.tarantool.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</PropertyGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Include="MsgPack.Light" Version="1.5.0" />
31+
<PackageReference Include="MsgPack.Light" Version="1.6.0" />
3232
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
3333
<PackageReference Include="System.Threading.Thread" Version="4.3.0" />
3434
</ItemGroup>

tests/progaudi.tarantool.tests/progaudi.tarantool.tests.csproj

+7-5
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,17 @@
1717
<GenerateAssemblyTitleAttribute>true</GenerateAssemblyTitleAttribute>
1818
<GenerateAssemblyProductAttribute>true</GenerateAssemblyProductAttribute>
1919
<GenerateAssemblyCopyrightAttribute>true</GenerateAssemblyCopyrightAttribute>
20+
21+
<IsPackable>false</IsPackable>
2022
</PropertyGroup>
2123

2224
<ItemGroup>
23-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
25+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
2426
<PackageReference Include="StackExchange.Redis" Version="1.2.6" />
25-
<PackageReference Include="xunit" Version="2.3.1" />
26-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
27-
<PackageReference Include="JetBrains.Annotations" Version="11.1.0" />
28-
<PackageReference Include="Shouldly" Version="3.0.0" />
27+
<PackageReference Include="xunit" Version="2.4.0" />
28+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
29+
<PackageReference Include="JetBrains.Annotations" Version="2018.2.1" />
30+
<PackageReference Include="Shouldly" Version="3.0.1" />
2931
<ProjectReference Include="..\..\src\progaudi.tarantool\progaudi.tarantool.csproj" />
3032
</ItemGroup>
3133

0 commit comments

Comments
 (0)