Merge pull request #12 from alphacloud/releases/5.0.0

Release 5.0.0
alphacloud · Oct 29, 2021 · b26a4f3 · b26a4f3
2 parents f9cd341 + 552efdd
commit b26a4f3
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 31 deletions.
diff --git a/.build/definitions.cake b/.build/definitions.cake
@@ -1,23 +1,21 @@
 // ADDINS
-#addin nuget:?package=Cake.Coveralls&version=0.10.1
-#addin nuget:?package=Cake.FileHelpers&version=3.2.1
-#addin nuget:?package=Cake.Incubator&version=5.1.0
-#addin nuget:?package=Cake.Issues&version=0.8.1
-#addin nuget:?package=Cake.AppVeyor&version=4.0.0
+#addin nuget:?package=Cake.Coveralls&version=1.1.0
+#addin nuget:?package=Cake.FileHelpers&version=4.0.1
+#addin nuget:?package=Cake.AppVeyor&version=5.0.1
 
 // TOOLS
-#tool nuget:?package=GitReleaseManager&version=0.10.3
-#tool nuget:?package=GitVersion.CommandLine&version=5.1.3
+#tool nuget:?package=GitReleaseManager&version=0.12.1
+#tool nuget:?package=GitVersion.CommandLine&version=5.7.0
 #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=OpenCover&version=4.7.1221
+#tool nuget:?package=ReportGenerator&version=4.8.13
 
 
 public class CodeCoverageSettings
 {
     public string ExcludeByFile { get; set; } = "*/*Designer.cs";
     public string ExcludeByAttribute { get; set; } = "*.ExcludeFromCodeCoverage*";
-    public string ExcludeFilter { get; set; } = "-[Tests*]*";
+    public string ExcludeFilter { get; set; } = "-[Tests*]*;-[*]Microsoft.CodeAnalysis*;-[*]System.Runtime.CompilerServices.*";
     public string IncludeFilter { get; set; }
 }
 

diff --git a/.build/tasks.cake b/.build/tasks.cake
@@ -103,14 +103,18 @@ Task("CleanPreviousTestResults")
             DeleteFile(build.Paths.TestCoverageOutputFile);
         DeleteFiles(build.Paths.ArtifactsDir + "/*.trx");
         if (DirectoryExists(build.Paths.TestCoverageReportDir))
-            DeleteDirectory(build.Paths.TestCoverageReportDir, recursive: true);
+            DeleteDirectory(build.Paths.TestCoverageReportDir, new DeleteDirectorySettings 
+            {
+                Force = true,
+                Recursive = true
+            });
     });
 
 Task("GenerateCoverageReport")
     .WithCriteria<BuildInfo>((ctx, build) => build.IsLocal)
     .Does<BuildInfo>(build =>
     {
-        ReportGenerator(build.Paths.TestCoverageOutputFile, build.Paths.TestCoverageReportDir);
+        ReportGenerator((FilePath)build.Paths.TestCoverageOutputFile, build.Paths.TestCoverageReportDir);
     });
 
 Task("UploadCoverage")
@@ -152,7 +156,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,

diff --git a/appveyor.yml b/appveyor.yml
@@ -20,9 +20,6 @@ environment:
   GITHUB_TOKEN:
     secure: SakrMxbclSjNzFQxv8sA35OhulfvNm9VqHBEOgQrebPaF/Bv7AmZRsT8/YEfSQED
 
-install:
-  - ps: ./dotnet-install.ps1  -Version 3.1.102 -InstallDir "C:\Program Files\dotnet"
-
 build_script:
   - ps: ./build.ps1
 
@@ -36,7 +33,7 @@ deploy:
   - provider: NuGet
     name: Pre release
     api_key:
-      secure: 6mTfswrYx6hJYzdwupTCsUUjXg+I50iqf81rGl6Zly7XlJtjT+KshLk7pNmT3TCN
+      secure: aotSklcEg4wlJFSwi2b374XONmm/GqWbvVtNuwJV8bChfnXDHF3/hhPIiblxiUKV
     on:
       branch:
         - develop
@@ -47,6 +44,6 @@ deploy:
   - provider: NuGet
     name: Tagged release
     api_key:
-      secure: 6mTfswrYx6hJYzdwupTCsUUjXg+I50iqf81rGl6Zly7XlJtjT+KshLk7pNmT3TCN
+      secure: aotSklcEg4wlJFSwi2b374XONmm/GqWbvVtNuwJV8bChfnXDHF3/hhPIiblxiUKV
     on:
       appveyor_repo_tag: true
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup Label="Build">
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
     <SignAssembly>True</SignAssembly>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -23,7 +23,7 @@
     <Copyright>(c) Alphacloud</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/alphacloud/dotnet-readbin</PackageProjectUrl>
-    <PackageReleaseNotes>https://github.com/alphacloud/dotnet-readbin/releases/tag/1.0.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/alphacloud/dotnet-readbin/releases/tag/5.0.0</PackageReleaseNotes>
     <PackageTags>dotnet-cli bson messagepack alphacloud</PackageTags>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/alphacloud/dotnet-readbin</RepositoryUrl>

diff --git a/src/dotnet-readbin/dotnet-readbin.csproj b/src/dotnet-readbin/dotnet-readbin.csproj
@@ -19,10 +19,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" PrivateAssets="all" />
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.6.0" />
-    <PackageReference Include="MessagePack" Version="2.1.90" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="JetBrains.Annotations" Version="2021.2.0" PrivateAssets="all" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="3.1.0" />
+    <PackageReference Include="MessagePack" Version="2.3.85" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
   </ItemGroup>
 

diff --git a/src/tests/ReadBin.Tests/ReadBin.Tests.csproj b/src/tests/ReadBin.Tests/ReadBin.Tests.csproj
@@ -11,17 +11,17 @@
 
   <ItemGroup>
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="FluentAssertions" Version="5.10.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="FluentAssertions" Version="6.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.6.0" />
-    <PackageReference Include="MessagePack" Version="2.1.90" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="JetBrains.Annotations" Version="2021.2.0" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="3.1.0" />
+    <PackageReference Include="MessagePack" Version="2.3.85" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
   </ItemGroup>