Move cake test to a new project dedicated to cake

AArnott · AArnott · commit 7f83a80bddb5 · 2021-09-16T08:51:19.000-06:00
And some other touch-ups
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -122,7 +122,7 @@ stages:
         --no-build $(testModifier)
         -c $(BuildConfiguration)
         --filter "TestCategory!=FailsOnAzurePipelines"
-        --logger "trx;LogFileName=$(Build.ArtifactStagingDirectory)/TestLogs/TestResults.trx"
+        --logger "trx;LogFileName=$(Build.ArtifactStagingDirectory)/TestLogs/TestResults.x64.trx"
         --results-directory $(Build.ArtifactStagingDirectory)/CodeCoverage/
         --collect:"XPlat Code Coverage"
         --
@@ -135,7 +135,7 @@ stages:
         --no-build $(testModifier)
         -c $(BuildConfiguration)
         --filter "TestCategory!=FailsOnAzurePipelines"
-        --logger "trx;LogFileName=$(Build.ArtifactStagingDirectory)/TestLogs/TestResults.trx"
+        --logger "trx;LogFileName=$(Build.ArtifactStagingDirectory)/TestLogs/TestResults.x86.trx"
         --results-directory $(Build.ArtifactStagingDirectory)/CodeCoverage/
         --collect:"XPlat Code Coverage"
         --
@@ -144,6 +144,19 @@ stages:
       workingDirectory: src
       condition: ne(variables['dotnet32'], '')
 
+    - script: >
+        dotnet test Cake.GitVersioning.Tests
+        --no-build $(testModifier)
+        -c $(BuildConfiguration)
+        --filter "TestCategory!=FailsOnAzurePipelines"
+        --logger "trx;LogFileName=$(Build.ArtifactStagingDirectory)/TestLogs/TestResults.cake.trx"
+        --results-directory $(Build.ArtifactStagingDirectory)/CodeCoverage/
+        --collect:"XPlat Code Coverage"
+        --
+        RunConfiguration.DisableAppDomain=true
+      displayName: Run cake tests
+      workingDirectory: src
+
     - task: PublishCodeCoverageResults@1
       displayName: Publish code coverage results
       inputs:
diff --git a/src/Cake.GitVersioning.Tests/Cake.GitVersioning.Tests.csproj b/src/Cake.GitVersioning.Tests/Cake.GitVersioning.Tests.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net5.0;net461</TargetFrameworks>
+    <SignAssembly>false</SignAssembly>
+    <IsTestProject>true</IsTestProject>
+    <IsPackable>false</IsPackable>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Cake.GitVersioning\Cake.GitVersioning.csproj" />
+    <ProjectReference Include="..\NerdBank.GitVersioning\NerdBank.GitVersioning.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="1.3.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Cake.GitVersioning.Tests/GitVersioningCloudProviderTests.cs b/src/Cake.GitVersioning.Tests/GitVersioningCloudProviderTests.cs
diff --git a/src/Cake.GitVersioning/Cake.GitVersioning.csproj b/src/Cake.GitVersioning/Cake.GitVersioning.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Authors>Chris Crutchfield, Andrew Arnott</Authors>
     <Company>andarno</Company>
diff --git a/src/Cake.GitVersioning/GitVersioningAliases.cs b/src/Cake.GitVersioning/GitVersioningAliases.cs
@@ -6,6 +6,7 @@
     using Cake.Core;
     using Cake.Core.Annotations;
     using Nerdbank.GitVersioning;
+    using Nerdbank.GitVersioning.Commands;
 
     /// <summary>
     /// Contains functionality for using Nerdbank.GitVersioning.
diff --git a/src/Cake.GitVersioning/GitVersioningCloudSettings.cs b/src/Cake.GitVersioning/GitVersioningCloudSettings.cs
@@ -1,5 +1,8 @@
-﻿namespace Cake.GitVersioning
+﻿#nullable enable
+
+namespace Cake.GitVersioning
 {
+    using System;
     using System.Collections.Generic;
 
     /// <summary>
@@ -8,35 +11,35 @@
     public class GitVersioningCloudSettings
     {
         /// <summary>
-        /// The string to use for the cloud build number. 
-        /// If not value os specified, the computed version will be used.
+        /// The string to use for the cloud build number.
+        /// If no value is specified, the computed version will be used.
         /// </summary>
-        public string Version { get; set; } = null;
+        public string? Version { get; set; }
 
         /// <summary>
         /// Adds an identifier to the build metadata part of a semantic version.
         /// </summary>
-        public IList<string> Metadata { get; set; } = new List<string>();
+        public List<string> Metadata { get; } = new();
 
         /// <summary>
         /// Force activation for a particular CI system. If not specified,
         /// auto-detection will be used.
         /// </summary>
-        public GitVersioningCloudProvider? CISystem { get; set; } = null;
+        public GitVersioningCloudProvider? CISystem { get; set; }
 
         /// <summary>
         /// Defines ALL version variables as cloud build variables, with a "NBGV_" prefix.
         /// </summary>
-        public bool AllVariables { get; set; } = false;
+        public bool AllVariables { get; set; }
 
         /// <summary>
         /// Defines a few common version variables as cloud build variables, with a "Git" prefix.
         /// </summary>
-        public bool CommonVariables { get; set; } = false;
+        public bool CommonVariables { get; set; }
 
         /// <summary>
         /// Additional cloud build variables to define.
         /// </summary>
-        public IDictionary<string, string> AdditionalVariables { get; set; } = new Dictionary<string, string>();
+        public Dictionary<string, string> AdditionalVariables { get; } = new(StringComparer.OrdinalIgnoreCase);
     }
 }
diff --git a/src/NerdBank.GitVersioning.Tests/NerdBank.GitVersioning.Tests.csproj b/src/NerdBank.GitVersioning.Tests/NerdBank.GitVersioning.Tests.csproj
@@ -28,7 +28,6 @@
     <EmbeddedResource Include="repos\*" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Cake.GitVersioning\Cake.GitVersioning.csproj" />
     <ProjectReference Include="..\Nerdbank.GitVersioning.Tasks\Nerdbank.GitVersioning.Tasks.csproj" />
     <ProjectReference Include="..\NerdBank.GitVersioning\NerdBank.GitVersioning.csproj" />
   </ItemGroup>
diff --git a/src/NerdBank.GitVersioning/Commands/CloudCommand.cs b/src/NerdBank.GitVersioning/Commands/CloudCommand.cs
@@ -1,4 +1,4 @@
-﻿namespace Nerdbank.GitVersioning
+﻿namespace Nerdbank.GitVersioning.Commands
 {
     using System;
     using System.Collections.Generic;
@@ -7,7 +7,7 @@
     using Validation;
 
     /// <summary>
-    /// Implementation of the "nbgv cloud" command that updates the build environments variables with version variables
+    /// Implementation of the "nbgv cloud" command that updates the build environments variables with version variables.
     /// </summary>
     public class CloudCommand
     {
@@ -17,23 +17,23 @@ public class CloudCommand
         public enum CloudCommandError
         {
             /// <summary>
-            /// Teh specified CI system was not found
+            /// The specified CI system was not found.
             /// </summary>
             NoCloudBuildProviderMatch,
 
             /// <summary>
-            /// A cloud variable was defined multiple times
+            /// A cloud variable was defined multiple times.
             /// </summary>
             DuplicateCloudVariable,
 
             /// <summary>
-            /// No supported cloud build environment could be detected
+            /// No supported cloud build environment could be detected.
             /// </summary>
-            NoCloudBuildEnvDetected
+            NoCloudBuildEnvDetected,
         }
 
         /// <summary>
-        /// Exception indicating an error while setting build variables
+        /// Exception indicating an error while setting build variables.
         /// </summary>
         public class CloudCommandException : Exception
         {
@@ -43,7 +43,7 @@ public class CloudCommandException : Exception
             public CloudCommandError Error { get; }
 
             /// <summary>
-            /// Initializes a new instance of <see cref="CloudCommandException"/>
+            /// Initializes a new instance of <see cref="CloudCommandException"/> class.
             /// </summary>
             /// <param name="message">The message that describes the error.</param>
             /// <param name="error">The error that occurred.</param>
@@ -79,7 +79,7 @@ public CloudCommand(TextWriter outputWriter = null, TextWriter errorWriter = nul
         /// The string to use for the cloud build number. If not specified, the computed version will be used.
         /// </param>
         /// <param name="ciSystem">
-        /// The CI system to activate. If not specified, auto-detection will be used.   
+        /// The CI system to activate. If not specified, auto-detection will be used.
         /// </param>
         /// <param name="allVars">
         /// Controls whether to define all version variables as cloud build variables.
diff --git a/src/NerdBank.GitVersioning/LibGit2/LibGit2Context.cs b/src/NerdBank.GitVersioning/LibGit2/LibGit2Context.cs
@@ -77,7 +77,7 @@ public override bool TrySelectCommit(string committish)
         }
 
         /// <inheritdoc />
-        public override void Stage(string path) => Commands.Stage(this.Repository, path);
+        public override void Stage(string path) => global::LibGit2Sharp.Commands.Stage(this.Repository, path);
 
         /// <inheritdoc/>
         public override string GetShortUniqueCommitId(int minLength) => this.Repository.ObjectDatabase.ShortenObjectId(this.Commit, minLength);
diff --git a/src/NerdBank.GitVersioning/ReleaseManager.cs b/src/NerdBank.GitVersioning/ReleaseManager.cs
@@ -295,7 +295,7 @@ public void PrepareRelease(string projectDirectory, string releaseUnstableTag =
 
             // create release branch and update version
             var releaseBranch = repository.CreateBranch(releaseBranchName);
-            Commands.Checkout(repository, releaseBranch);
+            global::LibGit2Sharp.Commands.Checkout(repository, releaseBranch);
             this.UpdateVersion(context, versionOptions.Version, releaseVersion);
 
             if (outputMode == ReleaseManagerOutputMode.Text)
@@ -304,7 +304,7 @@ public void PrepareRelease(string projectDirectory, string releaseUnstableTag =
             }
 
             // update version on main branch
-            Commands.Checkout(repository, originalBranchName);
+            global::LibGit2Sharp.Commands.Checkout(repository, originalBranchName);
             this.UpdateVersion(context, versionOptions.Version, nextDevVersion);
 
             if (outputMode == ReleaseManagerOutputMode.Text)
@@ -371,7 +371,7 @@ private void UpdateVersion(LibGit2Context context, SemanticVersion oldVersion, S
                 versionOptions.Version = newVersion;
                 var filePath = context.VersionFile.SetVersion(context.AbsoluteProjectDirectory, versionOptions, includeSchemaProperty: true);
 
-                Commands.Stage(context.Repository, filePath);
+                global::LibGit2Sharp.Commands.Stage(context.Repository, filePath);
 
                 // Author a commit only if we effectively changed something.
                 if (!context.Repository.Head.Tip.Tree.Equals(context.Repository.Index.WriteToTree()))
diff --git a/src/nbgv/Program.cs b/src/nbgv/Program.cs
@@ -12,6 +12,7 @@ namespace Nerdbank.GitVersioning.Tool
     using System.Threading;
     using System.Threading.Tasks;
     using Microsoft.Build.Construction;
+    using Nerdbank.GitVersioning.Commands;
     using Nerdbank.GitVersioning.LibGit2;
     using Newtonsoft.Json;
     using NuGet.Common;

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public override bool TrySelectCommit(string committish)`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`/// <inheritdoc />`
`80`		`- public override void Stage(string path) => Commands.Stage(this.Repository, path);`
	`80`	`+ public override void Stage(string path) => global::LibGit2Sharp.Commands.Stage(this.Repository, path);`
`81`	`81`
`82`	`82`	`/// <inheritdoc/>`
`83`	`83`	`public override string GetShortUniqueCommitId(int minLength) => this.Repository.ObjectDatabase.ShortenObjectId(this.Commit, minLength);`