Merge branch 'release/0.6.4'

cake-contrib · Jan 10, 2019 · 8895d3d · 8895d3d
2 parents 985602c + bd51228
commit 8895d3d
Show file tree

Hide file tree

Showing 21 changed files with 376 additions and 610 deletions.
diff --git a/README.md b/README.md
@@ -18,9 +18,10 @@ and for general information about the Cake build automation system see the [Cake
 
 ## Build Status
 
-|Develop|Master|
-|:--:|:--:|
-|[![Build status](https://ci.appveyor.com/api/projects/status/s8t8j2gh6icynkod/branch/develop?svg=true)](https://ci.appveyor.com/project/cakecontrib/cake-issues-pullrequests-tfs/branch/develop)|[![Build status](https://ci.appveyor.com/api/projects/status/s8t8j2gh6icynkod/branch/develop?svg=true)](https://ci.appveyor.com/project/cakecontrib/cake-issues-pullrequests-tfs/branch/master)|
+| | Develop | Master |
+|:--:|:--:|:--:|
+|AppVeyor Windows|[![Build status](https://ci.appveyor.com/api/projects/status/s8t8j2gh6icynkod/branch/develop?svg=true)](https://ci.appveyor.com/project/cakecontrib/cake-issues-pullrequests-tfs/branch/develop)|[![Build status](https://ci.appveyor.com/api/projects/status/s8t8j2gh6icynkod/branch/master?svg=true)](https://ci.appveyor.com/project/cakecontrib/cake-issues-pullrequests-tfs/branch/master)|
+|Azure DevOps Windows|[![Build Status](https://dev.azure.com/cake-contrib/Cake.Issues.PullRequests.Tfs/_apis/build/status/cake-contrib.Cake.Issues.PullRequests.Tfs?branchName=develop&jobName=Windows)](https://dev.azure.com/cake-contrib/Cake.Issues.PullRequests.Tfs/_build/latest?definitionId=8?branchName=develop)|[![Build Status](https://dev.azure.com/cake-contrib/Cake.Issues.PullRequests.Tfs/_apis/build/status/cake-contrib.Cake.Issues.PullRequests.Tfs?branchName=master&jobName=Windows)](https://dev.azure.com/cake-contrib/Cake.Issues.PullRequests.Tfs/_build/latest?definitionId=8?branchName=master)|
 
 ## Code Coverage
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -0,0 +1,16 @@
+trigger:
+- develop
+- master
+- release/*
+- hotfix/*
+
+pr:
+- develop
+
+jobs:
+- job: Windows
+  pool:
+    vmImage: 'vs2017-win2016'
+  steps:
+  - powershell: ./build.ps1
+    displayName: 'Cake Build'
diff --git a/nuspec/nuget/Cake.Issues.PullRequests.Tfs.nuspec b/nuspec/nuget/Cake.Issues.PullRequests.Tfs.nuspec
@@ -23,7 +23,7 @@ See the Project Site for an overview of the whole ecosystem of addins for workin
     <repository type="git" url="https://github.com/cake-contrib/Cake.Issues.PullRequests.Tfs"/>
     <copyright>Copyright © BBT Software AG and contributors</copyright>
     <tags>Cake Script Cake-Issues Cake-PullRequestSystem Issues PullRequest TFS Azure-DevOps</tags>
-    <releaseNotes>https://github.com/cake-contrib/Cake.Issues.PullRequests.Tfs/releases/tag/0.6.3</releaseNotes>
+    <releaseNotes>https://github.com/cake-contrib/Cake.Issues.PullRequests.Tfs/releases/tag/0.6.4</releaseNotes>
   </metadata>
   <files>
     <file src="Cake.Issues.PullRequests.Tfs.dll" target="lib\net461" />

diff --git a/setup.cake b/setup.cake
@@ -17,7 +17,7 @@ BuildParameters.PrintParameters(Context);
 ToolSettings.SetToolSettings(
     context: Context,
     dupFinderExcludePattern: new string[] { BuildParameters.RootDirectoryPath + "/src/Cake.Issues.PullRequests.Tfs.Tests/Capabilities/*.cs" },
-    testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]* -[Cake.Issues]* -[Cake.Issues.Testing]* -[Cake.Issues.PullRequests]*",
+    testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]* -[Cake.Issues]* -[Cake.Issues.Testing]* -[Cake.Issues.PullRequests]* -[Cake.Tfs]* -[*]Costura.AssemblyLoader -[*]ProcessedByFody",
     testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*",
     testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs");
 

diff --git a/src/Cake.Issues.PullRequests.Tfs.Tests/Cake.Issues.PullRequests.Tfs.Tests.csproj b/src/Cake.Issues.PullRequests.Tfs.Tests/Cake.Issues.PullRequests.Tfs.Tests.csproj
@@ -42,15 +42,15 @@
     <PackageReference Include="NSubstitute">
       <Version>3.1.0</Version>
     </PackageReference>
-    <PackageReference Include="Shouldly" Version="3.0.0" />
+    <PackageReference Include="Shouldly" Version="3.0.2" />
     <PackageReference Include="StyleCop.Analyzers">
       <Version>1.0.2</Version>
     </PackageReference>
     <PackageReference Include="xunit">
-      <Version>2.4.0</Version>
+      <Version>2.4.1</Version>
     </PackageReference>
     <PackageReference Include="xunit.runner.visualstudio">
-      <Version>2.4.0</Version>
+      <Version>2.4.1</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
@@ -72,7 +72,6 @@
     <Compile Include="Capabilities\TfsFilteringByModifiedFilesCapabilityTests.cs" />
     <Compile Include="Capabilities\TfsDiscussionThreadsCapabilityTests.cs" />
     <Compile Include="Capabilities\TfsCheckingCommitIdCapabilityTests.cs" />
-    <Compile Include="TfsCredentialsExtensionsTests.cs" />
     <Compile Include="TfsPullRequestSystemTests.cs" />
     <Compile Include="TfsPullRequestSystemSettingsTests.cs" />
   </ItemGroup>

diff --git a/src/Cake.Issues.PullRequests.Tfs.Tests/Capabilities/CommentExtensionsTests.cs b/src/Cake.Issues.PullRequests.Tfs.Tests/Capabilities/CommentExtensionsTests.cs
@@ -2,7 +2,7 @@
 {
     using Cake.Issues.PullRequests.Tfs.Capabilities;
     using Cake.Issues.Testing;
-    using Microsoft.TeamFoundation.SourceControl.WebApi;
+    using Cake.Tfs.PullRequest.CommentThread;
     using Shouldly;
     using Xunit;
 
@@ -14,7 +14,7 @@ public sealed class TheToPullRequestDiscussionCommentExtension
             public void Should_Throw_If_Comment_Is_Null()
             {
                 // Given
-                Comment comment = null;
+                TfsComment comment = null;
 
                 // When
                 var result = Record.Exception(() => comment.ToPullRequestDiscussionComment());
@@ -29,7 +29,7 @@ public void Should_Set_Correct_Content()
                 // Given
                 var content = "foo";
                 var comment =
-                    new Comment
+                    new TfsComment
                     {
                         Content = content
                     };
@@ -48,7 +48,7 @@ public void Should_Set_Correct_IsDeleted(bool isDeleted)
             {
                 // Given
                 var comment =
-                    new Comment
+                    new TfsComment
                     {
                         IsDeleted = isDeleted
                     };

diff --git a/src/Cake.Issues.PullRequests.Tfs.Tests/Capabilities/CommentThreadStatusExtensionsTests.cs b/src/Cake.Issues.PullRequests.Tfs.Tests/Capabilities/CommentThreadStatusExtensionsTests.cs
@@ -1,7 +1,7 @@
 namespace Cake.Issues.PullRequests.Tfs.Tests.Capabilities
 {
     using Cake.Issues.PullRequests.Tfs.Capabilities;
-    using Microsoft.TeamFoundation.SourceControl.WebApi;
+    using Cake.Tfs.PullRequest.CommentThread;
     using Shouldly;
     using Xunit;
 
@@ -11,28 +11,28 @@ public sealed class TheToPullRequestDiscussionStatusExtension
         {
             [Theory]
             [InlineData(
-                CommentThreadStatus.Unknown,
+                TfsCommentThreadStatus.Unknown,
                 PullRequestDiscussionStatus.Unknown)]
             [InlineData(
-                CommentThreadStatus.Active,
+                TfsCommentThreadStatus.Active,
                 PullRequestDiscussionStatus.Active)]
             [InlineData(
-                CommentThreadStatus.Pending,
+                TfsCommentThreadStatus.Pending,
                 PullRequestDiscussionStatus.Active)]
             [InlineData(
-                CommentThreadStatus.Fixed,
+                TfsCommentThreadStatus.Fixed,
                 PullRequestDiscussionStatus.Resolved)]
             [InlineData(
-                CommentThreadStatus.WontFix,
+                TfsCommentThreadStatus.WontFix,
                 PullRequestDiscussionStatus.Resolved)]
             [InlineData(
-                CommentThreadStatus.Closed,
+                TfsCommentThreadStatus.Closed,
                 PullRequestDiscussionStatus.Resolved)]
             [InlineData(
-                CommentThreadStatus.ByDesign,
+                TfsCommentThreadStatus.ByDesign,
                 PullRequestDiscussionStatus.Resolved)]
             public void Should_Return_Correct_Value(
-                CommentThreadStatus status,
+                TfsCommentThreadStatus status,
                 PullRequestDiscussionStatus expectedResult)
             {
                 // Given
@@ -49,28 +49,28 @@ public sealed class TheToPullRequestDiscussionResolutionExtension
         {
             [Theory]
             [InlineData(
-                CommentThreadStatus.Unknown,
+                TfsCommentThreadStatus.Unknown,
                 PullRequestDiscussionResolution.Unknown)]
             [InlineData(
-                CommentThreadStatus.Active,
+                TfsCommentThreadStatus.Active,
                 PullRequestDiscussionResolution.Unknown)]
             [InlineData(
-                CommentThreadStatus.Pending,
+                TfsCommentThreadStatus.Pending,
                 PullRequestDiscussionResolution.Unknown)]
             [InlineData(
-                CommentThreadStatus.Fixed,
+                TfsCommentThreadStatus.Fixed,
                 PullRequestDiscussionResolution.Resolved)]
             [InlineData(
-                CommentThreadStatus.WontFix,
+                TfsCommentThreadStatus.WontFix,
                 PullRequestDiscussionResolution.WontFix)]
             [InlineData(
-                CommentThreadStatus.Closed,
+                TfsCommentThreadStatus.Closed,
                 PullRequestDiscussionResolution.Resolved)]
             [InlineData(
-                CommentThreadStatus.ByDesign,
+                TfsCommentThreadStatus.ByDesign,
                 PullRequestDiscussionResolution.Resolved)]
             public void Should_Return_Correct_Value(
-                CommentThreadStatus status,
+                TfsCommentThreadStatus status,
                 PullRequestDiscussionResolution expectedResult)
             {
                 // Given