feat: update MsgPack.Light & CI

Signed-off-by: Anatoly Popov <[email protected]>
progaudi · Nov 21, 2023 · d2ec20e · d2ec20e
1 parent c783473
commit d2ec20e
Show file tree

Hide file tree

Showing 13 changed files with 158 additions and 91 deletions.
diff --git a/.azure/build.yml b/.azure/build.yml
diff --git a/.azure/test.yml b/.azure/test.yml
diff --git a/.azure/tests.yml b/.azure/tests.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,61 @@
+name: Build, Test & Publish nuget
+
+on:
+  push:
+    branches: [ "master" ]
+    tags: ['*']
+  pull_request:
+    types: [ opened, synchronize ]
+    branches: [ "master" ]
+
+env:
+  NuGetDirectory: ${{ github.workspace }}/nuget
+
+jobs:
+  build_test_and_pack:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0 # Fetches entire history, so we can analyze commits since last tag
+    - name: Setup .net core
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: |
+          3.1.x
+          6.0.x
+
+    - name: Restore dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build -c Release --no-restore
+
+    - name: Docker build
+      run: docker-compose build
+
+    - name: Docker pull
+      run: docker-compose pull
+
+    - name: Docker-compose run
+      run: docker-compose up -d
+
+    - name: Tests
+      run: dotnet test -c Release --no-build --verbosity normal
+
+    - name: Pack nuget
+      if: success()
+      run: |
+        set +x
+        NUGET_VERSION=$(git describe --tags --abbrev=1 | sed 's/-/./')
+        dotnet pack -c Release --no-build -v minimal -o ${{ env.NuGetDirectory }} -p:PackageVersion=$NUGET_VERSION
+    - name: Publish NuGet package
+      if: success() && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
+      run: dotnet nuget push "${{ env.NuGetDirectory }}/*.nupkg" --api-key "${{ secrets.NUGET_PUSH }}" --source https://api.nuget.org/v3/index.json --skip-duplicate
+    - name: Upload files to a GitHub release
+      if: success() && github.ref_type == 'tag' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
+      uses: xresloader/[email protected]
+      with:
+        file: ${{ env.NuGetDirectory }}/*.nupkg
+        tags: true
+        overwrite: true
+        tag_name: ${{ github.ref_name }}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -1,24 +1,37 @@
 {
     // See https://go.microsoft.com/fwlink/?LinkId=733558
     // for the documentation about the tasks.json format
-    "version": "0.1.0",
+    "version": "2.0.0",
     "command": "dotnet",
-    "isShellCommand": true,
     "args": [],
     "tasks": [
         {
-            "taskName": "build",
-            "args": [ "progaudi.tarantool.sln"],
-            "isBuildCommand": true,
-            "showOutput": "silent",
-            "problemMatcher": "$msCompile"
+            "label": "build",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "progaudi.tarantool.sln"
+            ],
+            "problemMatcher": "$msCompile",
+            "group": {
+                "_id": "build",
+                "isDefault": false
+            }
         },
         {
-            "taskName": "test",
-            "args": [ "tests/progaudi.tarantool.tests/progaudi.tarantool.tests.csproj"],
-            "isTestCommand": true,
-            "showOutput": "silent",
-            "problemMatcher": "$msCompile"
+            "label": "test",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "test",
+                "tests/progaudi.tarantool.tests/progaudi.tarantool.tests.csproj"
+            ],
+            "problemMatcher": "$msCompile",
+            "group": {
+                "_id": "test",
+                "isDefault": false
+            }
         }
     ]
 }
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,8 @@
+<Project>
+  <PropertyGroup>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <MSBuildTreatWarningsAsErrors>true</MSBuildTreatWarningsAsErrors>
+    <IsPublishable>false</IsPublishable>
+    <NoWarn>NETSDK1138</NoWarn>
+  </PropertyGroup>
+</Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,21 @@
+<Project>
+    <PropertyGroup>
+      <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    </PropertyGroup>
+    <ItemGroup>
+      <PackageVersion Include="MsgPack.Light" Version="2.0.1" />
+      <PackageVersion Include="System.Net.NameResolution" Version="4.3.0" />
+      <PackageVersion Include="System.Threading.Thread" Version="4.3.0" />
+
+      <!-- benchmark -->
+      <PackageVersion Include="BenchmarkDotNet" Version="0.10.12" />
+      <PackageVersion Include="StackExchange.Redis" Version="1.2.6" />
+
+      <!-- tests -->
+      <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+      <PackageVersion Include="xunit" Version="2.4.0" />
+      <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.0" />
+      <PackageVersion Include="JetBrains.Annotations" Version="2018.2.1" />
+      <PackageVersion Include="Shouldly" Version="3.0.1" />
+    </ItemGroup>
+  </Project>
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,10 +2,10 @@ version: '3.2'
 
 services:
     tarantool_1_7:
-        image: progaudi/tarantool:1.7.5-184-g5be3a82be # same version as tarantool in homebrew on mac os
+        build:
+            context: tarantool
+            dockerfile: docker/Dockerfile.1.7
         command: tarantool /usr/local/share/tarantool/tarantool.docker.lua
-        volumes:
-            - $PWD/tarantool:/usr/local/share/tarantool
         ports:
             - "3301:3301"
         environment:
@@ -14,10 +14,10 @@ services:
             TARANTOOL_SLAB_ALLOC_ARENA: 0.1
 
     tarantool_1_8:
-        image: progaudi/tarantool:1.8.2-288-g99128d7d3
+        build:
+            context: tarantool
+            dockerfile: docker/Dockerfile.1.8
         command: tarantool /usr/local/share/tarantool/tarantool.docker.lua
-        volumes:
-            - $PWD/tarantool:/usr/local/share/tarantool
         ports:
             - "3302:3301"
         environment:

diff --git a/src/progaudi.tarantool.benchmark/progaudi.tarantool.benchmark.csproj b/src/progaudi.tarantool.benchmark/progaudi.tarantool.benchmark.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp1.1;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
     <WarningsAsErrors>true</WarningsAsErrors>
 
     <AssemblyName>progaudi.tarantool.benchmark</AssemblyName>
@@ -12,8 +12,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.10.12" />
-    <PackageReference Include="StackExchange.Redis" Version="1.2.6" />
+    <PackageReference Include="BenchmarkDotNet" />
+    <PackageReference Include="StackExchange.Redis" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/progaudi.tarantool/progaudi.tarantool.csproj b/src/progaudi.tarantool/progaudi.tarantool.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
-    <TargetFrameworks>net46;netstandard1.4;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net462;netstandard2.0;net60</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
-    <TargetFrameworks>netstandard1.4;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net60</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup>
     <PatchLevelVersion Condition=" '$(BuildNumber)' == '' ">0</PatchLevelVersion>
@@ -16,21 +16,23 @@
     <AssemblyName>progaudi.tarantool</AssemblyName>
     <RootNamespace>ProGaudi.Tarantool.Client</RootNamespace>
     <Product>progaudi.tarantool</Product>
-    <Copyright>Copyright © 2016-2018</Copyright>
+    <Copyright>Copyright © 2016-2023</Copyright>
 
     <PackageTags>tarantool;csharp</PackageTags>
     <PackageProjectUrl>https://github.com/progaudi/progaudi.tarantool</PackageProjectUrl>
-    <PackageLicenseUrl>https://raw.githubusercontent.com/progaudi/progaudi.tarantool/master/LICENSE</PackageLicenseUrl>
+
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
 
     <GenerateAssemblyTitleAttribute>true</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyProductAttribute>true</GenerateAssemblyProductAttribute>
     <GenerateAssemblyCopyrightAttribute>true</GenerateAssemblyCopyrightAttribute>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MsgPack.Light" Version="1.6.2" />
-    <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
-    <PackageReference Include="System.Threading.Thread" Version="4.3.0" />
+    <PackageReference Include="MsgPack.Light" />
+    <PackageReference Include="System.Net.NameResolution" />
+    <PackageReference Include="System.Threading.Thread" />
   </ItemGroup>
 
   <ItemGroup>
@@ -83,4 +85,9 @@
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.4' ">
     <DefineConstants>$(DefineConstants);PROGAUDI_NETCORE</DefineConstants>
   </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="..\..\LICENSE" Pack="true" PackagePath="\"/>
+    <None Include="..\..\README.md" Pack="true" PackagePath="\"/>
+  </ItemGroup>
 </Project>
diff --git a/tarantool/docker/Dockerfile.1.7 b/tarantool/docker/Dockerfile.1.7
@@ -0,0 +1,6 @@
+FROM progaudi/tarantool:1.7.5-184-g5be3a82be
+
+RUN set -x \
+    && mkdir -p /usr/local/share/tarantool
+
+COPY --chown=tarantool:tarantool *.lua /usr/local/share/tarantool/
diff --git a/tarantool/docker/Dockerfile.1.8 b/tarantool/docker/Dockerfile.1.8
@@ -0,0 +1,6 @@
+FROM progaudi/tarantool:1.8.2-288-g99128d7d3
+
+RUN set -x \
+    && mkdir -p /usr/local/share/tarantool
+
+COPY --chown=tarantool:tarantool *.lua /usr/local/share/tarantool/
diff --git a/tests/progaudi.tarantool.tests/progaudi.tarantool.tests.csproj b/tests/progaudi.tarantool.tests/progaudi.tarantool.tests.csproj
@@ -2,13 +2,13 @@
   <PropertyGroup>
     <Description>progaudi.tarantool Class Library tests</Description>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp1.0;netcoreapp1.1;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
     <WarningsAsErrors>true</WarningsAsErrors>
 
     <AssemblyName>progaudi.tarantool.tests</AssemblyName>
     <RootNamespace>ProGaudi.Tarantool.Client.Tests</RootNamespace>
     <Product>progaudi.tarantool</Product>
-    <Copyright>Copyright © 2016-2017</Copyright>
+    <Copyright>Copyright © 2016-2023</Copyright>
 
     <PackageTags>tarantool;csharp;tests</PackageTags>
     <PackageProjectUrl>https://github.com/progaudi/progaudi.tarantool</PackageProjectUrl>
@@ -22,12 +22,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
-    <PackageReference Include="StackExchange.Redis" Version="1.2.6" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
-    <PackageReference Include="JetBrains.Annotations" Version="2018.2.1" />
-    <PackageReference Include="Shouldly" Version="3.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="StackExchange.Redis" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" />
+    <PackageReference Include="JetBrains.Annotations" />
+    <PackageReference Include="Shouldly" />
     <ProjectReference Include="..\..\src\progaudi.tarantool\progaudi.tarantool.csproj" />
   </ItemGroup>