Merge branch 'releases/2.1.0'

alphacloud · Feb 8, 2020 · efd6406 · efd6406
2 parents cde412b + 943c3b6
commit efd6406
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 23 deletions.
diff --git a/.build/definitions.cake b/.build/definitions.cake
@@ -139,7 +139,7 @@ public class BuildInfo {
 
     public RepositoryInfo Repository { get; protected set; }
 
-    public Credentials GitHubCredentials { get; protected set; }
+    public string  GitHubToken { get; protected set; }
 
     public Paths Paths { get; protected set; }
 
@@ -164,10 +164,7 @@ public class BuildInfo {
             semVersion.MajorMinorPatch
         );
 
-        var githubCredentials = new Credentials(
-            context.EnvironmentVariable("GITHUB_USER"),
-            context.EnvironmentVariable("GITHUB_PASSWORD")
-        );
+        var gitHubToken = context.EnvironmentVariable("GITHUB_TOKEN");
 
         return new BuildInfo {
             Target = target,
@@ -178,7 +175,7 @@ public class BuildInfo {
             AppVeyorJobId = buildSystem.AppVeyor.Environment.JobId,
             Version = version,
             Repository = RepositoryInfo.Get(buildSystem, settings),
-            GitHubCredentials = githubCredentials,
+            GitHubToken = gitHubToken,
             Settings = settings,
             Paths = new Paths(context),
         };

diff --git a/.build/tasks.cake b/.build/tasks.cake
@@ -185,7 +185,7 @@ Task("CreateRelease")
     .Does<BuildInfo>(build =>
     {
         GitReleaseManagerCreate(
-            build.GitHubCredentials.UserName, build.GitHubCredentials.Password,
+            build.GitHubToken,
             build.Settings.RepoOwner, build.Settings.RepoName,
             new GitReleaseManagerCreateSettings {
               Milestone = build.Version.Milestone,
@@ -199,7 +199,7 @@ Task("CloseMilestone")
     .Does<BuildInfo>(build =>
     {
         GitReleaseManagerClose(
-            build.GitHubCredentials.UserName, build.GitHubCredentials.Password,
+            build.GitHubToken,
             build.Settings.RepoOwner, build.Settings.RepoName,
             build.Version.Milestone
         );

diff --git a/appveyor.yml b/appveyor.yml
@@ -17,14 +17,12 @@ environment:
   coveralls_repo_token:
     secure: PPV4OTsE0mqUJQ5UXY8dKJnifv+488XNxe7rtyUbiYJNMgvOooUZvGeSxhsOIJmJ
   CAKE_SETTINGS_SKIPVERIFICATION: true
-  GITHUB_USER:
-    secure: 5NfHPjw31vB/XxJqwpHp3cl3n/9F7PTUVXhMIqRSDJE=
-  GITHUB_PASSWORD:
-    secure: 9gArAAMTQRHIsSZcJ+87GM+kaSfsBlouuFHtBR1hWBY=
+  GITHUB_TOKEN:
+    secure: SakrMxbclSjNzFQxv8sA35OhulfvNm9VqHBEOgQrebPaF/Bv7AmZRsT8/YEfSQED
 
 install:
-  - ps: ./dotnet-install.ps1  -Version 3.1.100 -InstallDir "C:\Program Files\dotnet"
-  - ps: ./dotnet-install.ps1  -Version 3.0.101 -InstallDir "C:\Program Files\dotnet"
+  - ps: ./dotnet-install.ps1  -Version 3.1.101 -InstallDir "C:\Program Files\dotnet"
+  - ps: ./dotnet-install.ps1  -Version 3.0.102 -InstallDir "C:\Program Files\dotnet"
   - ps: ./dotnet-install.ps1  -Version 2.2.207 -InstallDir "C:\Program Files\dotnet"
   - ps: ./dotnet-install.ps1  -Version 2.1.607 -InstallDir "C:\Program Files\dotnet"
 

diff --git a/...oud.MessagePack.AspNetCore.Formatters/Alphacloud.MessagePack.AspNetCore.Formatters.csproj b/...oud.MessagePack.AspNetCore.Formatters/Alphacloud.MessagePack.AspNetCore.Formatters.csproj
@@ -32,7 +32,7 @@
 
   <ItemGroup Label="Package References">
     <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" PrivateAssets="All" />
-    <PackageReference Include="MessagePack" Version="[2.0.323, 3.0.0)" />
+    <PackageReference Include="MessagePack" Version="[2.1.80, 3.0.0)" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
 

diff --git a/src/lib/Alphacloud.MessagePack.HttpFormatter/Alphacloud.MessagePack.HttpFormatter.csproj b/src/lib/Alphacloud.MessagePack.HttpFormatter/Alphacloud.MessagePack.HttpFormatter.csproj
@@ -15,7 +15,7 @@
 
   <ItemGroup Label="Package References">
     <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" PrivateAssets="All" />
-    <PackageReference Include="MessagePack" Version="[2.0.323, 3.0.0)" />
+    <PackageReference Include="MessagePack" Version="[2.1.80, 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" />

diff --git a/src/lib/Alphacloud.MessagePack.HttpFormatter/MsgPackHttpClientExtensions.cs b/src/lib/Alphacloud.MessagePack.HttpFormatter/MsgPackHttpClientExtensions.cs
@@ -85,7 +85,7 @@ public static Task<HttpResponseMessage> PutAsMsgPackAsync<T>(
         ///     serialized using MessagePack format.
         /// </summary>
         /// <remarks>
-        ///     This method uses a default instance of <see cref="MessagePackMediaTypeFormatter" /> (
+        ///     This method uses default instance of <see cref="MessagePackMediaTypeFormatter" /> (
         ///     <see cref="ContractlessStandardResolver" />).
         /// </remarks>
         /// <typeparam name="T">The type of <paramref name="value" />.</typeparam>

diff --git a/src/samples/NetCoreWebApi/NetCoreWebApi.csproj b/src/samples/NetCoreWebApi/NetCoreWebApi.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <PackageReference Include=" Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
+    <PackageReference Include=" Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/tests/Tests.Functional/Tests.Functional.csproj b/src/tests/Tests.Functional/Tests.Functional.csproj
@@ -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.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
   </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.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
   </ItemGroup>
 
   <ItemGroup>