Skip to content

Commit

Permalink
Merge pull request #82 from alphacloud/releases/2.1.2
Browse files Browse the repository at this point in the history
Release 2.1.2
  • Loading branch information
cd21h authored May 29, 2020
2 parents 028525d + fcc5328 commit 3f00dc3
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 25 deletions.
6 changes: 3 additions & 3 deletions .build/definitions.cake
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
#addin nuget:?package=Cake.AppVeyor&version=4.0.0

// TOOLS
#tool nuget:?package=GitReleaseManager&version=0.10.3
#tool nuget:?package=GitVersion.CommandLine&version=5.1.3
#tool nuget:?package=GitReleaseManager&version=0.11.0
#tool nuget:?package=GitVersion.CommandLine&version=5.3.3
#tool nuget:?package=coveralls.io&version=1.4.2
#tool nuget:?package=OpenCover&version=4.7.922
#tool nuget:?package=ReportGenerator&version=4.5.0
#tool nuget:?package=ReportGenerator&version=4.5.8


public class CodeCoverageSettings
Expand Down
2 changes: 1 addition & 1 deletion .build/tasks.cake
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ Task("Build")
.Does<BuildInfo>(build =>
{
if (build.IsRelease) {
Information("Running {0} build for code coverage", "Debug");
Information("Running {0} build to calculate code coverage", "Debug");
// need Debug build for code coverage
DotNetCoreBuild(build.Paths.SrcDir, new DotNetCoreBuildSettings {
NoRestore = true,
Expand Down
6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ environment:
secure: SakrMxbclSjNzFQxv8sA35OhulfvNm9VqHBEOgQrebPaF/Bv7AmZRsT8/YEfSQED

install:
- ps: ./dotnet-install.ps1 -Version 3.1.102 -InstallDir "C:\Program Files\dotnet"
- ps: ./dotnet-install.ps1 -Version 3.1.300 -InstallDir "C:\Program Files\dotnet"
- ps: ./dotnet-install.ps1 -Version 3.0.103 -InstallDir "C:\Program Files\dotnet"
- ps: ./dotnet-install.ps1 -Version 2.2.402 -InstallDir "C:\Program Files\dotnet"
- ps: ./dotnet-install.ps1 -Version 2.1.804 -InstallDir "C:\Program Files\dotnet"
Expand All @@ -39,7 +39,7 @@ deploy:
- provider: NuGet
name: Pre-release
api_key:
secure: UtOq3A67FSX/X2GYpy2sRB0a9xEoguCkjUuo8UTV9svFeVJT//g4IhJiyCtSYq9u
secure: Mug776kbm/x+2nuUeELzQmONvvDpKK1xk18/eeXySdBWT1fKXo9lXEhWILdhWcaE
on:
branch:
- develop
Expand All @@ -50,6 +50,6 @@ deploy:
- provider: NuGet
name: Tagged release
api_key:
secure: UtOq3A67FSX/X2GYpy2sRB0a9xEoguCkjUuo8UTV9svFeVJT//g4IhJiyCtSYq9u
secure: Mug776kbm/x+2nuUeELzQmONvvDpKK1xk18/eeXySdBWT1fKXo9lXEhWILdhWcaE
on:
appveyor_repo_tag: true
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="[2.1.0, 2.2.0)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="[2.1.0, 2.2.0)" />
<PackageReference Include="System.Collections.Immutable" Version="1.7.0" />
<PackageReference Include="System.Collections.Immutable" Version="1.7.1" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.2'">
<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="[2.2.0, 3.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="[2.2.0, 3.0.0)" />
<PackageReference Include="System.Collections.Immutable" Version="1.7.0" />
<PackageReference Include="System.Collections.Immutable" Version="1.7.1" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
Expand All @@ -28,12 +28,12 @@

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="System.IO.Pipelines" Version="4.7.0" />
<PackageReference Include="System.IO.Pipelines" Version="4.7.2" />
</ItemGroup>

<ItemGroup Label="Package References">
<PackageReference Include="JetBrains.Annotations" Version="2019.1.3" PrivateAssets="All" />
<PackageReference Include="MessagePack" Version="[2.1.90, 3.0.0)" />
<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" />
<PackageReference Include="MessagePack" Version="[2.1.115, 3.0.0)" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
</PropertyGroup>

<PropertyGroup Label="Package">
<PackageTags>messagepack msgpack webapi formatter serialization alphacloud</PackageTags>
<Description>MessagePack formatters for WebApi client</Description>
<PackageTags>messagepack msgpack webapi formatter serialization webapi-client alphacloud</PackageTags>
<Description>MessagePack formatters for WebApi client (Microsoft.AspNet.WebApi.Client).</Description>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\..\common\AssemblyVersion.cs" Link="AssemblyVersion.cs" />
</ItemGroup>

<ItemGroup Label="Package References">
<PackageReference Include="JetBrains.Annotations" Version="2019.1.3" PrivateAssets="All" />
<PackageReference Include="MessagePack" Version="[2.1.90, 3.0.0)" />
<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" />
<PackageReference Include="MessagePack" Version="[2.1.115, 3.0.0)" />
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="[5.2.7, 6.0.0)" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="System.Collections.Immutable" Version="1.7.0" />
<PackageReference Include="System.Collections.Immutable" Version="1.7.1" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/samples/NetCoreWebApi/NetCoreWebApi.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
<PackageReference Include=" Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.1" />
<PackageReference Include=" Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.4" />
</ItemGroup>

<ItemGroup>
Expand Down
14 changes: 7 additions & 7 deletions src/tests/Tests.Functional/Tests.Functional.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

<ItemGroup>
<PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
<PackageReference Include="FluentAssertions" Version="5.10.2" />
<PackageReference Include="Moq" Version="4.13.1" />
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Moq" Version="4.14.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
<PrivateAssets>all</PrivateAssets>
Expand All @@ -19,23 +19,23 @@
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
<PackageReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.2'">
<PackageReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 3f00dc3

Please sign in to comment.