Merge branch 'master' into feature/repo-dirty-flag

arturcic · web-flow · commit a90ca14835fa · 2020-10-19T11:47:00.000+02:00
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "0.37.0",
+      "version": "0.38.5",
       "commands": [
         "dotnet-cake"
       ]
diff --git a/build.cake b/build.cake
@@ -2,29 +2,29 @@
 #module nuget:?package=Cake.DotNetTool.Module&version=0.4.0
 
 // Install addins.
-#addin "nuget:?package=Cake.Codecov&version=0.8.0"
+#addin "nuget:?package=Cake.Codecov&version=0.9.1"
 #addin "nuget:?package=Cake.Compression&version=0.2.4"
-#addin "nuget:?package=Cake.Coverlet&version=2.4.2"
-#addin "nuget:?package=Cake.Docker&version=0.11.0"
-#addin "nuget:?package=Cake.Git&version=0.21.0"
+#addin "nuget:?package=Cake.Coverlet&version=2.5.1"
+#addin "nuget:?package=Cake.Docker&version=0.11.1"
+#addin "nuget:?package=Cake.Git&version=0.22.0"
 #addin "nuget:?package=Cake.Gitter&version=0.11.1"
 #addin "nuget:?package=Cake.Incubator&version=5.1.0"
-#addin "nuget:?package=Cake.Json&version=4.0.0"
-#addin "nuget:?package=Cake.Kudu&version=0.10.1"
+#addin "nuget:?package=Cake.Json&version=5.2.0"
+#addin "nuget:?package=Cake.Kudu&version=0.11.0"
 #addin "nuget:?package=Cake.Wyam&version=2.2.9"
 
 #addin "nuget:?package=Newtonsoft.Json&version=12.0.3"
-#addin "nuget:?package=SharpZipLib&version=1.2.0"
+#addin "nuget:?package=SharpZipLib&version=1.3.0"
 #addin "nuget:?package=xunit.assert&version=2.4.1"
 
 // Install tools.
 #tool "nuget:?package=NUnit.ConsoleRunner&version=3.11.1"
-#tool "nuget:?package=nuget.commandline&version=5.4.0"
+#tool "nuget:?package=nuget.commandline&version=5.7.0"
 #tool "nuget:?package=KuduSync.NET&version=1.5.3"
 
 // Install .NET Core Global tools.
-#tool "dotnet:?package=Codecov.Tool&version=1.10.0"
-#tool "dotnet:?package=dotnet-format&version=3.3.111304"
+#tool "dotnet:?package=Codecov.Tool&version=1.12.3"
+#tool "dotnet:?package=dotnet-format&version=4.1.131201"
 #tool "dotnet:?package=GitReleaseManager.Tool&version=0.11.0"
 #tool "dotnet:?package=Wyam.Tool&version=2.2.9"
 
diff --git a/build.config b/build.config
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-DOTNET_VERSION=2.1.807,3.1.301
+DOTNET_VERSION=2.1.811,3.1.403
diff --git a/build/publish.cake b/build/publish.cake
@@ -35,11 +35,11 @@ Task("Publish-AzurePipeline")
 {
     foreach(var artifact in parameters.Artifacts.All)
     {
-        if (FileExists(artifact.ArtifactPath)) { TFBuild.Commands.UploadArtifact("", artifact.ArtifactPath, "artifacts"); }
+        if (FileExists(artifact.ArtifactPath)) { AzurePipelines.Commands.UploadArtifact("", artifact.ArtifactPath, "artifacts"); }
     }
     foreach(var package in parameters.Packages.All)
     {
-        if (FileExists(package.PackagePath)) { TFBuild.Commands.UploadArtifact("", package.PackagePath, "packages"); }
+        if (FileExists(package.PackagePath)) { AzurePipelines.Commands.UploadArtifact("", package.PackagePath, "packages"); }
     }
 })
 .OnError(exception =>
diff --git a/build/test.cake b/build/test.cake
@@ -39,11 +39,15 @@ Task("UnitTest")
                     Exclude = new List<string> { "[GitVersion*.Tests]*", "[GitVersionTask.MsBuild]*" }
                 };
 
-                if (IsRunningOnUnix() && string.Equals(framework, parameters.FullFxVersion48))
+                if (string.Equals(framework, parameters.FullFxVersion48)) 
                 {
-                    settings.Filter = "TestCategory!=NoMono";
+                    if (IsRunningOnUnix()) {
+                        settings.Filter = "TestCategory!=NoMono";
+                    } else {
+                        settings.Filter = "TestCategory!=NoNet48";
+                    }
                 }
-
+                
                 DotNetCoreTest(project.FullPath, settings, coverletSettings);
             });
         }
@@ -69,12 +73,12 @@ Task("UnitTest")
     if (parameters.IsRunningOnAzurePipeline)
     {
         if (testResultsFiles.Any()) {
-            var data = new TFBuildPublishTestResultsData {
+            var data = new AzurePipelinesPublishTestResultsData {
                 TestResultsFiles = testResultsFiles.ToArray(),
                 Platform = Context.Environment.Platform.Family.ToString(),
-                TestRunner = TFTestRunnerType.NUnit
+                TestRunner = AzurePipelinesTestRunnerType.NUnit
             };
-            TFBuild.Commands.PublishTestResults(data);
+            AzurePipelines.Commands.PublishTestResults(data);
         }
     }
 });
diff --git a/build/utils/utils.cake b/build/utils/utils.cake
@@ -23,7 +23,7 @@ public static bool IsOnMainRepo(this ICakeContext context)
     }
     else if (buildSystem.IsRunningOnAzurePipelines || buildSystem.IsRunningOnAzurePipelinesHosted)
     {
-        repositoryName = buildSystem.TFBuild.Environment.Repository.RepoName;
+        repositoryName = buildSystem.AzurePipelines.Environment.Repository.RepoName;
     }
     else if (buildSystem.IsRunningOnGitHubActions)
     {
@@ -49,7 +49,7 @@ public static bool IsOnMainBranch(this ICakeContext context)
     }
     else if (buildSystem.IsRunningOnAzurePipelines || buildSystem.IsRunningOnAzurePipelinesHosted)
     {
-        repositoryBranch = buildSystem.TFBuild.Environment.Repository.SourceBranchName;
+        repositoryBranch = buildSystem.AzurePipelines.Environment.Repository.SourceBranchName;
     }
     else if (buildSystem.IsRunningOnGitHubActions)
     {
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -35,7 +35,7 @@
         <PackageVersion_GitToolsTesting>1.2.0</PackageVersion_GitToolsTesting>
         <PackageVersion_NUnit3TestAdapter>3.17.0</PackageVersion_NUnit3TestAdapter>
         <PackageVersion_NunitXmlTestLogger>2.1.62</PackageVersion_NunitXmlTestLogger>
-        <PackageVersion_Shouldly>4.0.0-beta0002</PackageVersion_Shouldly>
+        <PackageVersion_Shouldly>4.0.0-beta0004</PackageVersion_Shouldly>
 
     </PropertyGroup>
 
diff --git a/src/GitVersion.sln.DotSettings b/src/GitVersion.sln.DotSettings
@@ -549,6 +549,7 @@ II.2.12 &lt;HandlesEvent /&gt;&#xD;
 	<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=5C63448180C9174C8C28A084F80E37DF/RelativePath/@EntryValue"></s:String>
 	<s:Boolean x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File5C63448180C9174C8C28A084F80E37DF/@KeyIndexDefined">True</s:Boolean>
 	<s:Double x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File5C63448180C9174C8C28A084F80E37DF/RelativePriority/@EntryValue">1</s:Double>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002EDaemon_002ESettings_002EMigration_002ESwaWarningsModeSettingsMigrate/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpFileLayoutPatternsUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
diff --git a/src/GitVersionCore.Tests/Configuration/ConfigProviderTests.cs b/src/GitVersionCore.Tests/Configuration/ConfigProviderTests.cs
@@ -198,8 +198,8 @@ public void NextVersionCanHavePatch()
 
         [Test]
         [MethodImpl(MethodImplOptions.NoInlining)]
-        [Category("NoMono")]
-        [Description("Won't run on Mono due to source information not being available for ShouldMatchApproved.")]
+        [Category(NoMono)]
+        [Description(NoMonoDescription)]
         public void CanWriteOutEffectiveConfiguration()
         {
             var config = configProvider.Provide(repoPath);
diff --git a/src/GitVersionCore.Tests/Configuration/IgnoreConfigTests.cs b/src/GitVersionCore.Tests/Configuration/IgnoreConfigTests.cs
@@ -1,13 +1,15 @@
 using System;
 using System.IO;
 using GitVersion.Configuration;
+using GitVersion.Model.Configuration;
 using GitVersionCore.Tests.Helpers;
 using NUnit.Framework;
 using Shouldly;
 using YamlDotNet.Core;
 
 namespace GitVersionCore.Tests.Configuration
 {
+
     [TestFixture]
     public class IgnoreConfigTests : TestBase
     {
@@ -34,7 +36,7 @@ public void ShouldSupportsOtherSequenceFormat()
         {
             var yaml = @"
 ignore:
-    sha: 
+    sha:
         - b6c0c9fda88830ebcd563e500a5a7da5a1658e98
         - 6c19c7c219ecf8dbc468042baefa73a1b213e8b1
 ";
@@ -59,7 +61,7 @@ public void WhenNotInConfigShouldHaveDefaults()
 
             config.Ignore.ShouldNotBeNull();
             config.Ignore.ShAs.ShouldBeEmpty();
-            config.Ignore.Before.ShouldBeNull();
+            config.Ignore.Before.ShouldBe(null);
         }
 
         [Test]
@@ -73,5 +75,13 @@ public void WhenBadDateFormatShouldFail()
             using var reader = new StringReader(yaml);
             Should.Throw<YamlException>(() => ConfigSerializer.Read(reader));
         }
+
+        [Test]
+        public void NewInstanceShouldBeEmpty()
+        {
+            var ignoreConfig = new IgnoreConfig();
+
+            ignoreConfig.IsEmpty.ShouldBeTrue();
+        }
     }
 }
diff --git a/src/GitVersionCore.Tests/Configuration/Init/InitScenarios.cs b/src/GitVersionCore.Tests/Configuration/Init/InitScenarios.cs
@@ -21,8 +21,8 @@ public void Setup()
         }
 
         [Test]
-        [Category("NoMono")]
-        [Description("Won't run on Mono due to source information not being available for ShouldMatchApproved.")]
+        [Category(NoMono)]
+        [Description(NoMonoDescription)]
         public void CanSetNextVersion()
         {
             var workingDirectory = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "c:\\proj" : "/proj";
diff --git a/src/GitVersionCore.Tests/Core/GitVersionExecutorTests.cs b/src/GitVersionCore.Tests/Core/GitVersionExecutorTests.cs
@@ -79,8 +79,8 @@ public void GitPreparerShouldNotFailWhenTargetPathNotInitialized()
         }
 
         [Test]
-        [Category("NoMono")]
-        [Description("LibGit2Sharp fails here when running under Mono")]
+        [Category(NoMono)]
+        [Description(NoMonoDescription)]
         public void CacheKeyForWorktree()
         {
             using var fixture = new EmptyRepositoryFixture();
@@ -173,7 +173,7 @@ public void CacheFileExistsOnDisk()
 
             var logsMessages = stringBuilder.ToString();
 
-            logsMessages.ShouldContain("Deserializing version variables from cache file", () => logsMessages);
+            logsMessages.ShouldContain("Deserializing version variables from cache file", Case.Insensitive, logsMessages);
         }
 
         [Test]
@@ -235,7 +235,7 @@ public void CacheFileExistsOnDiskWhenOverrideConfigIsSpecifiedVersionShouldBeDyn
             versionVariables.AssemblySemVer.ShouldBe("0.1.0.0");
 
             var cachedDirectoryTimestampAfter = fileSystem.GetLastDirectoryWrite(cacheDirectory);
-            cachedDirectoryTimestampAfter.ShouldBe(cacheDirectoryTimestamp, () => "Cache was updated when override config was set");
+            cachedDirectoryTimestampAfter.ShouldBe(cacheDirectoryTimestamp, "Cache was updated when override config was set");
         }
 
         [Test]
@@ -257,7 +257,7 @@ public void CacheFileIsMissing()
             gitVersionCalculator.CalculateVersionVariables();
 
             var logsMessages = stringBuilder.ToString();
-            logsMessages.ShouldContain("yml not found", () => logsMessages);
+            logsMessages.ShouldContain("yml not found", Case.Insensitive, logsMessages);
         }
 
         [Test]
@@ -412,8 +412,8 @@ public void WorkingDirectoryWithoutCommits()
         }
 
         [Test]
-        [Category("NoMono")]
-        [Description("LibGit2Sharp fails when running under Mono")]
+        [Category(NoMono)]
+        [Description(NoMonoDescription)]
         public void GetProjectRootDirectoryWorkingDirectoryWithWorktree()
         {
             using var fixture = new EmptyRepositoryFixture();
@@ -500,8 +500,8 @@ public void GetDotGitDirectoryNoWorktree()
         }
 
         [Test]
-        [Category("NoMono")]
-        [Description("LibGit2Sharp fails when running under Mono")]
+        [Category(NoMono)]
+        [Description(NoMonoDescription)]
         public void GetDotGitDirectoryWorktree()
         {
             using var fixture = new EmptyRepositoryFixture();
@@ -531,8 +531,8 @@ public void GetDotGitDirectoryWorktree()
         }
 
         [Test]
-        [Category("NoMono")]
-        [Description("LibGit2Sharp fails when running under Mono")]
+        [Category(NoMono)]
+        [Description(NoMonoDescription)]
         public void CalculateVersionFromWorktreeHead()
         {
             // Setup
diff --git a/src/GitVersionCore.Tests/DocumentationTests.cs b/src/GitVersionCore.Tests/DocumentationTests.cs
@@ -41,7 +41,7 @@ public void ConfigurationDocumentationIsUpToDate()
             foreach (var configProperty in configProperties)
             {
                 var formattedConfigProperty = $"### {configProperty}";
-                configurationDocumentationFile.ShouldContain(formattedConfigProperty,
+                configurationDocumentationFile.ShouldContain(formattedConfigProperty, Case.Insensitive,
                     Environment.NewLine + configurationDocumentationFile);
             }
         }
@@ -57,7 +57,7 @@ public void VariableDocumentationIsUpToDate()
 
             foreach (var variable in variables)
             {
-                variableDocumentationFile.ShouldContain(variable,
+                variableDocumentationFile.ShouldContain(variable, Case.Insensitive,
                     Environment.NewLine + variableDocumentationFile);
             }
         }
diff --git a/src/GitVersionCore.Tests/Helpers/TestBase.cs b/src/GitVersionCore.Tests/Helpers/TestBase.cs
@@ -13,6 +13,7 @@ public class TestBase
     {
         protected const string NoMonoDescription = "Won't run on Mono due to source information not being available for ShouldMatchApproved.";
         protected const string NoMono = "NoMono";
+        protected const string NoNet48 = "NoNet48";
 
         protected static IServiceProvider ConfigureServices(Action<IServiceCollection> overrideServices = null)
         {
diff --git a/src/GitVersionCore.Tests/IntegrationTests/WorktreeScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/WorktreeScenarios.cs
@@ -12,8 +12,8 @@ public class WorktreeScenarios : TestBase
     {
 
         [Test]
-        [Category("NoMono")]
-        [Description("LibGit2Sharp fails here when running under Mono")]
+        [Category(NoMono)]
+        [Description(NoMonoDescription)]
         public void UseWorktreeRepositoryForVersion()
         {
             using var fixture = new EmptyRepositoryFixture();
diff --git a/src/GitVersionCore.Tests/Model/MergeMessageTests.cs b/src/GitVersionCore.Tests/Model/MergeMessageTests.cs
@@ -31,7 +31,7 @@ public void EmptyMessageString(string message)
             sut.TargetBranch.ShouldBeNull();
             sut.MergedBranch.ShouldBeEmpty();
             sut.IsMergedPullRequest.ShouldBeFalse();
-            sut.PullRequestNumber.ShouldBeNull();
+            sut.PullRequestNumber.ShouldBe(null);
             sut.Version.ShouldBeNull();
         }
 
@@ -51,7 +51,7 @@ public void EmptyTagPrefix(string prefix)
             sut.TargetBranch.ShouldBeNull();
             sut.MergedBranch.ShouldBeEmpty();
             sut.IsMergedPullRequest.ShouldBeFalse();
-            sut.PullRequestNumber.ShouldBeNull();
+            sut.PullRequestNumber.ShouldBe(null);
             sut.Version.ShouldBeNull();
         }
 
@@ -81,7 +81,7 @@ public void ParsesMergeMessage(
             sut.TargetBranch.ShouldBe(expectedTargetBranch);
             sut.MergedBranch.ShouldBe(expectedMergedBranch);
             sut.IsMergedPullRequest.ShouldBeFalse();
-            sut.PullRequestNumber.ShouldBeNull();
+            sut.PullRequestNumber.ShouldBe(null);
             sut.Version.ShouldBe(expectedVersion);
         }
 
@@ -205,7 +205,7 @@ public void ParsesSmartGitMergeMessage(
             sut.TargetBranch.ShouldBe(expectedTargetBranch);
             sut.MergedBranch.ShouldBe(expectedMergedBranch);
             sut.IsMergedPullRequest.ShouldBeFalse();
-            sut.PullRequestNumber.ShouldBeNull();
+            sut.PullRequestNumber.ShouldBe(null);
             sut.Version.ShouldBe(expectedVersion);
         }
 
@@ -235,7 +235,7 @@ public void ParsesRemoteTrackingMergeMessage(
             sut.TargetBranch.ShouldBe(expectedTargetBranch);
             sut.MergedBranch.ShouldBe(expectedMergedBranch);
             sut.IsMergedPullRequest.ShouldBeFalse();
-            sut.PullRequestNumber.ShouldBeNull();
+            sut.PullRequestNumber.ShouldBe(null);
             sut.Version.ShouldBe(expectedVersion);
         }
 
@@ -285,7 +285,7 @@ public void MatchesSingleCustomMessage()
             sut.TargetBranch.ShouldBeNull();
             sut.MergedBranch.ShouldBeEmpty();
             sut.IsMergedPullRequest.ShouldBeFalse();
-            sut.PullRequestNumber.ShouldBeNull();
+            sut.PullRequestNumber.ShouldBe(null);
             sut.Version.ShouldBeNull();
         }
 
@@ -310,7 +310,7 @@ public void MatchesMultipleCustomMessages()
             sut.TargetBranch.ShouldBeNull();
             sut.MergedBranch.ShouldBeEmpty();
             sut.IsMergedPullRequest.ShouldBeFalse();
-            sut.PullRequestNumber.ShouldBeNull();
+            sut.PullRequestNumber.ShouldBe(null);
             sut.Version.ShouldBeNull();
         }
 
@@ -362,7 +362,7 @@ public void ReturnsAfterFirstMatchingPattern()
             sut.TargetBranch.ShouldBeNull();
             sut.MergedBranch.ShouldBe("this");
             sut.IsMergedPullRequest.ShouldBeFalse();
-            sut.PullRequestNumber.ShouldBeNull();
+            sut.PullRequestNumber.ShouldBe(null);
             sut.Version.ShouldBeNull();
         }
     }
diff --git a/src/GitVersionCore.Tests/VersionCalculation/JsonVersionBuilderTests.cs b/src/GitVersionCore.Tests/VersionCalculation/JsonVersionBuilderTests.cs
@@ -18,8 +18,8 @@ public void Setup()
         }
 
         [Test]
-        [Category("NoMono")]
-        [Description("Won't run on Mono due to source information not being available for ShouldMatchApproved.")]
+        [Category(NoMono)]
+        [Description(NoMonoDescription)]
         public void Json()
         {
             var semanticVersion = new SemanticVersion
diff --git a/src/GitVersionCore.Tests/VersionConverters/GitVersionInfoGeneratorTests.cs b/src/GitVersionCore.Tests/VersionConverters/GitVersionInfoGeneratorTests.cs
diff --git a/src/GitVersionCore/Model/Configuration/IgnoreConfig.cs b/src/GitVersionCore/Model/Configuration/IgnoreConfig.cs
diff --git a/src/GitVersionExe.Tests/ExecCmdLineArgumentTest.cs b/src/GitVersionExe.Tests/ExecCmdLineArgumentTest.cs
diff --git a/src/GitVersionTask.Tests/GenerateGitVersionInformationTest.cs b/src/GitVersionTask.Tests/GenerateGitVersionInformationTest.cs
diff --git a/src/GitVersionTask.Tests/GetVersionTaskTests.cs b/src/GitVersionTask.Tests/GetVersionTaskTests.cs
diff --git a/src/GitVersionTask.Tests/UpdateAssemblyInfoTaskTest.cs b/src/GitVersionTask.Tests/UpdateAssemblyInfoTaskTest.cs
diff --git a/src/GitVersionTask.Tests/WriteVersionInfoTest.cs b/src/GitVersionTask.Tests/WriteVersionInfoTest.cs

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"isRoot": true,`
`4`	`4`	`"tools": {`
`5`	`5`	`"cake.tool": {`
`6`		`- "version": "0.37.0",`
	`6`	`+ "version": "0.38.5",`
`7`	`7`	`"commands": [`
`8`	`8`	`"dotnet-cake"`
`9`	`9`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`#!/usr/bin/env bash`
`2`		`-DOTNET_VERSION=2.1.807,3.1.301`
	`2`	`+DOTNET_VERSION=2.1.811,3.1.403`
Original file line number	Diff line number	Diff line change
`@@ -35,11 +35,11 @@ Task("Publish-AzurePipeline")`
`35`	`35`	`{`
`36`	`36`	`foreach(var artifact in parameters.Artifacts.All)`
`37`	`37`	`{`
`38`		`- if (FileExists(artifact.ArtifactPath)) { TFBuild.Commands.UploadArtifact("", artifact.ArtifactPath, "artifacts"); }`
	`38`	`+ if (FileExists(artifact.ArtifactPath)) { AzurePipelines.Commands.UploadArtifact("", artifact.ArtifactPath, "artifacts"); }`
`39`	`39`	`}`
`40`	`40`	`foreach(var package in parameters.Packages.All)`
`41`	`41`	`{`
`42`		`- if (FileExists(package.PackagePath)) { TFBuild.Commands.UploadArtifact("", package.PackagePath, "packages"); }`
	`42`	`+ if (FileExists(package.PackagePath)) { AzurePipelines.Commands.UploadArtifact("", package.PackagePath, "packages"); }`
`43`	`43`	`}`
`44`	`44`	`})`
`45`	`45`	`.OnError(exception =>`
Original file line number	Diff line number	Diff line change
`@@ -39,11 +39,15 @@ Task("UnitTest")`
`39`	`39`	`Exclude = new List<string> { "[GitVersion.Tests]", "[GitVersionTask.MsBuild]*" }`
`40`	`40`	`};`
`41`	`41`
`42`		`- if (IsRunningOnUnix() && string.Equals(framework, parameters.FullFxVersion48))`
	`42`	`+ if (string.Equals(framework, parameters.FullFxVersion48))`
`43`	`43`	`{`
`44`		`- settings.Filter = "TestCategory!=NoMono";`
	`44`	`+ if (IsRunningOnUnix()) {`
	`45`	`+ settings.Filter = "TestCategory!=NoMono";`
	`46`	`+ } else {`
	`47`	`+ settings.Filter = "TestCategory!=NoNet48";`
	`48`	`+ }`
`45`	`49`	`}`
`46`		`-`
	`50`	`+`
`47`	`51`	`DotNetCoreTest(project.FullPath, settings, coverletSettings);`
`48`	`52`	`});`
`49`	`53`	`}`
`@@ -69,12 +73,12 @@ Task("UnitTest")`
`69`	`73`	`if (parameters.IsRunningOnAzurePipeline)`
`70`	`74`	`{`
`71`	`75`	`if (testResultsFiles.Any()) {`
`72`		`- var data = new TFBuildPublishTestResultsData {`
	`76`	`+ var data = new AzurePipelinesPublishTestResultsData {`
`73`	`77`	`TestResultsFiles = testResultsFiles.ToArray(),`
`74`	`78`	`Platform = Context.Environment.Platform.Family.ToString(),`
`75`		`- TestRunner = TFTestRunnerType.NUnit`
	`79`	`+ TestRunner = AzurePipelinesTestRunnerType.NUnit`
`76`	`80`	`};`
`77`		`- TFBuild.Commands.PublishTestResults(data);`
	`81`	`+ AzurePipelines.Commands.PublishTestResults(data);`
`78`	`82`	`}`
`79`	`83`	`}`
`80`	`84`	`});`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public static bool IsOnMainRepo(this ICakeContext context)`
`23`	`23`	`}`
`24`	`24`	`else if (buildSystem.IsRunningOnAzurePipelines \|\| buildSystem.IsRunningOnAzurePipelinesHosted)`
`25`	`25`	`{`
`26`		`- repositoryName = buildSystem.TFBuild.Environment.Repository.RepoName;`
	`26`	`+ repositoryName = buildSystem.AzurePipelines.Environment.Repository.RepoName;`
`27`	`27`	`}`
`28`	`28`	`else if (buildSystem.IsRunningOnGitHubActions)`
`29`	`29`	`{`
`@@ -49,7 +49,7 @@ public static bool IsOnMainBranch(this ICakeContext context)`
`49`	`49`	`}`
`50`	`50`	`else if (buildSystem.IsRunningOnAzurePipelines \|\| buildSystem.IsRunningOnAzurePipelinesHosted)`
`51`	`51`	`{`
`52`		`- repositoryBranch = buildSystem.TFBuild.Environment.Repository.SourceBranchName;`
	`52`	`+ repositoryBranch = buildSystem.AzurePipelines.Environment.Repository.SourceBranchName;`
`53`	`53`	`}`
`54`	`54`	`else if (buildSystem.IsRunningOnGitHubActions)`
`55`	`55`	`{`