Merge branch 'release/0.7.0'

cake-contrib · May 30, 2019 · cf368a9 · cf368a9
2 parents 8895d3d + f080e04
commit cf368a9
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 42 deletions.
diff --git a/nuspec/nuget/Cake.Issues.PullRequests.Tfs.nuspec b/nuspec/nuget/Cake.Issues.PullRequests.Tfs.nuspec
@@ -6,24 +6,24 @@
     <version>0.0.0</version>
     <authors>BBT Software AG and contributors</authors>
     <owners>bbtsoftware, pascalberger, cake-contrib</owners>
-    <summary>TFS and Azure DevOps support for the Cake.Issues addin for Cake Build Automation System</summary>
+    <summary>Azure DevOps support for the Cake.Issues addin for Cake Build Automation System</summary>
     <description>
-The Team Foundation Server / Azure DevOps support for the Cake.Issues addin for Cake allows you to
-write found issues as comments Team Foundation Server or Azure DevOps pull requests.
+The Azure DevOps / Azure DevOps Server support for the Cake.Issues addin for Cake allows you to
+write found issues as comments to Azure DevOps or Azure DevOps Server pull requests.
 
-This addin provides the aliases for writing to Team Foundation Server or Azure DevOps pull requests.
+This addin provides the aliases for writing to Azure DevOps or Azure DevOps Server pull requests.
 It also requires the core Cake.Issues and Cake.Issues.PullRequests addins and one or more issue providers.
 
 See the Project Site for an overview of the whole ecosystem of addins for working with issues in Cake scripts.
     </description>
-    <licenseUrl>https://github.com/cake-contrib/Cake.Issues.PullRequests.Tfs/blob/develop/LICENSE</licenseUrl>
+    <license type="expression">MIT</license>
     <projectUrl>http://cake-contrib.github.io/Cake.Issues.Website</projectUrl>
     <iconUrl>https://cdn.jsdelivr.net/gh/cake-contrib/graphics@a5cf0f881c390650144b2243ae551d5b9f836196/png/cake-contrib-medium.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <repository type="git" url="https://github.com/cake-contrib/Cake.Issues.PullRequests.Tfs"/>
+    <repository type="git" url="https://github.com/cake-contrib/Cake.Issues.PullRequests.Tfs.git"/>
     <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.4</releaseNotes>
+    <tags>Cake Script Cake-Issues Cake-PullRequestSystem Issues PullRequest TFS Azure-DevOps Azure-DevOps-Server</tags>
+    <releaseNotes>https://github.com/cake-contrib/Cake.Issues.PullRequests.Tfs/releases/tag/0.7.0</releaseNotes>
   </metadata>
   <files>
     <file src="Cake.Issues.PullRequests.Tfs.dll" target="lib\net461" />

diff --git a/setup.cake b/setup.cake
@@ -1,4 +1,4 @@
-#load nuget:https://www.myget.org/F/cake-contrib/api/v2?package=Cake.Recipe&prerelease
+#load nuget:?package=Cake.Recipe&version=1.0.0
 
 Environment.SetVariableNames();
 
@@ -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]* -[Cake.Tfs]* -[*]Costura.AssemblyLoader -[*]ProcessedByFody",
+    testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]* -[Cake.Issues]* -[Cake.Issues.Testing]* -[Cake.Issues.PullRequests]* -[Cake.Tfs]* -[Shouldly]* -[*]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
@@ -35,12 +35,12 @@
     <CodeAnalysisRuleSet>..\Cake.Issues.PullRequests.Tfs.Tests.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="0.28.0" />
-    <PackageReference Include="Cake.Issues" Version="0.6.0" />
-    <PackageReference Include="Cake.Issues.Testing" Version="0.6.0" />
-    <PackageReference Include="Cake.Testing" Version="0.28.0" />
+    <PackageReference Include="Cake.Core" Version="0.33.0" />
+    <PackageReference Include="Cake.Issues" Version="0.7.0" />
+    <PackageReference Include="Cake.Issues.Testing" Version="0.7.0" />
+    <PackageReference Include="Cake.Testing" Version="0.33.0" />
     <PackageReference Include="NSubstitute">
-      <Version>3.1.0</Version>
+      <Version>4.0.0</Version>
     </PackageReference>
     <PackageReference Include="Shouldly" Version="3.0.2" />
     <PackageReference Include="StyleCop.Analyzers">

diff --git a/....Issues.PullRequests.Tfs.Tests/Capabilities/GitPullRequestCommentThreadExtensionsTests.cs b/....Issues.PullRequests.Tfs.Tests/Capabilities/GitPullRequestCommentThreadExtensionsTests.cs
@@ -47,7 +47,7 @@ public void Should_Throw_If_Comments_Are_Null()
             }
 
             [Fact]
-            public void Should_Throw_If_Properties_Are_Null()
+            public void Should_Not_Throw_If_Properties_Are_Null()
             {
                 // Given
                 var thread =
@@ -61,10 +61,10 @@ public void Should_Throw_If_Properties_Are_Null()
                     };
 
                 // When
-                var result = Record.Exception(() => thread.ToPullRequestDiscussionThread());
+                var result = thread.ToPullRequestDiscussionThread();
 
                 // Then
-                result.IsInvalidOperationException("Properties collection is not created.");
+                result.CommentSource.ShouldBe(default(string));
             }
 
             [Fact]
@@ -305,7 +305,7 @@ public void Should_Throw_If_Thread_Is_Null()
             }
 
             [Fact]
-            public void Should_Throw_If_Properties_Are_Null()
+            public void Should_Not_Throw_If_Properties_Are_Null()
             {
                 // Given
                 var thread =
@@ -319,10 +319,10 @@ public void Should_Throw_If_Properties_Are_Null()
                     };
 
                 // When
-                var result = Record.Exception(() => thread.GetCommentSource());
+                var result = thread.GetCommentSource();
 
                 // Then
-                result.IsInvalidOperationException("Properties collection is not created.");
+                result.ShouldBe(default(string));
             }
 
             [Fact]
@@ -427,7 +427,7 @@ public void Should_Throw_If_Thread_Is_Null()
             }
 
             [Fact]
-            public void Should_Throw_If_Properties_Are_Null()
+            public void Should_Not_Throw_If_Properties_Are_Null()
             {
                 // Given
                 var thread =
@@ -442,10 +442,10 @@ public void Should_Throw_If_Properties_Are_Null()
                 var value = "foo";
 
                 // When
-                var result = Record.Exception(() => thread.IsCommentSource(value));
+                var result = thread.IsCommentSource(value);
 
                 // Then
-                result.IsInvalidOperationException("Properties collection is not created.");
+                result.ShouldBeFalse();
             }
 
             [Fact]
@@ -510,7 +510,7 @@ public void Should_Throw_If_Thread_Is_Null()
             }
 
             [Fact]
-            public void Should_Throw_If_Properties_Are_Null()
+            public void Should_Not_Throw_If_Properties_Are_Null()
             {
                 // Given
                 var thread =
@@ -524,10 +524,10 @@ public void Should_Throw_If_Properties_Are_Null()
                     };
 
                 // When
-                var result = Record.Exception(() => thread.GetIssueMessage());
+                var result = thread.GetIssueMessage();
 
                 // Then
-                result.IsInvalidOperationException("Properties collection is not created.");
+                result.ShouldBe(default(string));
             }
 
             [Fact]

diff --git a/src/Cake.Issues.PullRequests.Tfs.Tests/TfsPullRequestSystemSettingsTests.cs b/src/Cake.Issues.PullRequests.Tfs.Tests/TfsPullRequestSystemSettingsTests.cs
@@ -9,7 +9,7 @@ public sealed class TfsPullRequestSystemSettingsTests
         public sealed class TheCtor
         {
             [Fact]
-            public void Should_Throw_If_RepositoryUrl_For_SourceBranch_Is_Null()
+            public void Should_Throw_If_RepositoryUrl_For_SourceRefName_Is_Null()
             {
                 // Given / When
                 var result = Record.Exception(() => new TfsPullRequestSystemSettings(null, "foo", null));
@@ -19,33 +19,33 @@ public void Should_Throw_If_RepositoryUrl_For_SourceBranch_Is_Null()
             }
 
             [Fact]
-            public void Should_Throw_If_SourceBranch_Is_Null()
+            public void Should_Throw_If_SourceRefName_Is_Null()
             {
                 // Given / When
                 var result = Record.Exception(() => new TfsPullRequestSystemSettings(new Uri("http://example.com"), null, null));
 
                 // Then
-                result.IsArgumentNullException("sourceBranch");
+                result.IsArgumentNullException("sourceRefName");
             }
 
             [Fact]
-            public void Should_Throw_If_SourceBranch_Is_Empty()
+            public void Should_Throw_If_SourceRefName_Is_Empty()
             {
                 // Given / When
                 var result = Record.Exception(() => new TfsPullRequestSystemSettings(new Uri("http://example.com"), string.Empty, null));
 
                 // Then
-                result.IsArgumentOutOfRangeException("sourceBranch");
+                result.IsArgumentOutOfRangeException("sourceRefName");
             }
 
             [Fact]
-            public void Should_Throw_If_SourceBranch_Is_WhiteSpace()
+            public void Should_Throw_If_SourceRefName_Is_WhiteSpace()
             {
                 // Given / When
                 var result = Record.Exception(() => new TfsPullRequestSystemSettings(new Uri("http://example.com"), " ", null));
 
                 // Then
-                result.IsArgumentOutOfRangeException("sourceBranch");
+                result.IsArgumentOutOfRangeException("sourceRefName");
             }
 
             [Fact]

diff --git a/src/Cake.Issues.PullRequests.Tfs/Cake.Issues.PullRequests.Tfs.csproj b/src/Cake.Issues.PullRequests.Tfs/Cake.Issues.PullRequests.Tfs.csproj
@@ -37,20 +37,20 @@
     <CodeAnalysisRuleSet>..\Cake.Issues.PullRequests.Tfs.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="0.28.0" />
-    <PackageReference Include="Cake.Issues" Version="0.6.0" />
-    <PackageReference Include="Cake.Issues.PullRequests" Version="0.6.0" />
+    <PackageReference Include="Cake.Core" Version="0.33.0" />
+    <PackageReference Include="Cake.Issues" Version="0.7.0" />
+    <PackageReference Include="Cake.Issues.PullRequests" Version="0.7.0" />
     <PackageReference Include="Cake.Tfs">
-      <Version>0.2.5</Version>
+      <Version>0.3.0</Version>
     </PackageReference>
     <PackageReference Include="Costura.Fody">
-      <Version>3.3.0</Version>
+      <Version>3.3.3</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers">
-      <Version>2.6.2</Version>
+      <Version>2.9.2</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>12.0.1</Version>
+      <Version>12.0.2</Version>
     </PackageReference>
     <PackageReference Include="StyleCop.Analyzers">
       <Version>1.0.2</Version>

diff --git a/tools/packages.config b/tools/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-    <package id="Cake" version="0.32.0" />
+    <package id="Cake" version="0.32.1" />
 </packages>