Skip to content

Commit a70dd86

Browse files
asbjornuasbjornu
committed
Remove NoMono
Resolve GH-2316 by removing the `NoMono` test category.
1 parent 34b21cb commit a70dd86

File tree

16 files changed

+9
-95
lines changed

16 files changed

+9
-95
lines changed

‎build/build/Tasks/Test/UnitTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ private static void TestProjectForTarget(BuildContext context, FilePath project,
8989

9090
if (string.Equals(framework, Constants.FullFxVersion48))
9191
{
92-
settings.Filter = context.IsRunningOnUnix() ? $"TestCategory!={Constants.NoMono}" : $"TestCategory!={Constants.NoNet48}";
92+
settings.Filter = context.IsRunningOnUnix() ? string.Empty : $"TestCategory!={Constants.NoNet48}";
9393
}
9494

9595
context.DotNetTest(project.FullPath, settings, coverletSettings);

‎src/GitVersion.Core.Tests/Configuration/ConfigProviderTests.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,6 @@ public void NextVersionCanHavePatch()
228228

229229
[Test]
230230
[MethodImpl(MethodImplOptions.NoInlining)]
231-
[Category(NoMono)]
232-
[Description(NoMonoDescription)]
233231
public void CanWriteOutEffectiveConfiguration()
234232
{
235233
var config = this.configProvider.Provide(this.repoPath);

‎src/GitVersion.Core.Tests/Configuration/Init/InitScenarios.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ public class InitScenarios : TestBase
1717
public void Setup() => ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestAttribute>();
1818

1919
[Test]
20-
[Category(NoMono)]
21-
[Description(NoMonoDescription)]
2220
public void CanSetNextVersion()
2321
{
2422
var workingDirectory = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "c:\\proj" : "/proj";

‎src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@ public void GitPreparerShouldNotFailWhenTargetPathNotInitialized()
7373
}
7474

7575
[Test]
76-
[Category(NoMono)]
77-
[Description(NoMonoDescription)]
7876
public void CacheKeyForWorktree()
7977
{
8078
using var fixture = new EmptyRepositoryFixture();
@@ -411,8 +409,6 @@ public void WorkingDirectoryWithoutCommits()
411409
}
412410

413411
[Test]
414-
[Category(NoMono)]
415-
[Description(NoMonoDescription)]
416412
public void GetProjectRootDirectoryWorkingDirectoryWithWorktree()
417413
{
418414
using var fixture = new EmptyRepositoryFixture();
@@ -480,8 +476,6 @@ public void GetDotGitDirectoryNoWorktree()
480476
}
481477

482478
[Test]
483-
[Category(NoMono)]
484-
[Description(NoMonoDescription)]
485479
public void GetDotGitDirectoryWorktree()
486480
{
487481
using var fixture = new EmptyRepositoryFixture();
@@ -512,8 +506,6 @@ public void GetDotGitDirectoryWorktree()
512506
}
513507

514508
[Test]
515-
[Category(NoMono)]
516-
[Description(NoMonoDescription)]
517509
public void CalculateVersionFromWorktreeHead()
518510
{
519511
// Setup
@@ -543,8 +535,6 @@ public void CalculateVersionFromWorktreeHead()
543535
}
544536

545537
[Test]
546-
[Category(NoMono)]
547-
[Description(NoMonoDescription)]
548538
public void CalculateVersionVariables_TwoBranchHasSameCommitHeadDetachedAndNotTagged_ThrowException()
549539
{
550540
// Setup
@@ -571,8 +561,6 @@ public void CalculateVersionVariables_TwoBranchHasSameCommitHeadDetachedAndNotTa
571561
}
572562

573563
[Test]
574-
[Category(NoMono)]
575-
[Description(NoMonoDescription)]
576564
public void CalculateVersionVariables_TwoBranchHasSameCommitHeadDetachedAndTagged_ReturnSemver()
577565
{
578566
// Setup

‎src/GitVersion.Core.Tests/Helpers/TestBase.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ namespace GitVersion.Core.Tests.Helpers;
88

99
public class TestBase
1010
{
11-
protected const string NoMonoDescription = "Won't run on Mono due to source information not being available for ShouldMatchApproved.";
12-
protected const string NoMono = "NoMono";
1311
protected const string NoNet48 = "NoNet48";
1412
public const string MainBranch = "main";
1513

‎src/GitVersion.Core.Tests/IntegrationTests/WorktreeScenarios.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ public class WorktreeScenarios : TestBase
1212
{
1313

1414
[Test]
15-
[Category(NoMono)]
16-
[Description(NoMonoDescription)]
1715
public void UseWorktreeRepositoryForVersion()
1816
{
1917
using var fixture = new EmptyRepositoryFixture();

‎src/GitVersion.Core.Tests/VersionCalculation/JsonVersionBuilderTests.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ public class JsonVersionBuilderTests : TestBase
1313
public void Setup() => ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestAttribute>();
1414

1515
[Test]
16-
[Category(NoMono)]
17-
[Description(NoMonoDescription)]
1816
public void Json()
1917
{
2018
var semanticVersion = new SemanticVersion

‎src/GitVersion.Core.Tests/VersionCalculation/VariableProviderTests.cs

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ public void ShouldLogWarningWhenUsingDefaultInformationalVersionInCustomFormat()
4848
}
4949

5050
[Test]
51-
[Category(NoMono)]
52-
[Description(NoMonoDescription)]
5351
public void ProvidesVariablesInContinuousDeliveryModeForPreRelease()
5452
{
5553
var semVer = new SemanticVersion
@@ -75,8 +73,6 @@ public void ProvidesVariablesInContinuousDeliveryModeForPreRelease()
7573
}
7674

7775
[Test]
78-
[Category(NoMono)]
79-
[Description(NoMonoDescription)]
8076
public void ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding()
8177
{
8278
var semVer = new SemanticVersion
@@ -102,8 +98,6 @@ public void ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding()
10298
}
10399

104100
[Test]
105-
[Category(NoMono)]
106-
[Description(NoMonoDescription)]
107101
public void ProvidesVariablesInContinuousDeploymentModeForPreRelease()
108102
{
109103
var semVer = new SemanticVersion
@@ -128,8 +122,6 @@ public void ProvidesVariablesInContinuousDeploymentModeForPreRelease()
128122
}
129123

130124
[Test]
131-
[Category(NoMono)]
132-
[Description(NoMonoDescription)]
133125
public void ProvidesVariablesInContinuousDeliveryModeForStable()
134126
{
135127
var semVer = new SemanticVersion
@@ -153,8 +145,6 @@ public void ProvidesVariablesInContinuousDeliveryModeForStable()
153145
}
154146

155147
[Test]
156-
[Category(NoMono)]
157-
[Description(NoMonoDescription)]
158148
public void ProvidesVariablesInContinuousDeploymentModeForStable()
159149
{
160150
var semVer = new SemanticVersion
@@ -178,8 +168,6 @@ public void ProvidesVariablesInContinuousDeploymentModeForStable()
178168
}
179169

180170
[Test]
181-
[Category(NoMono)]
182-
[Description(NoMonoDescription)]
183171
public void ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged()
184172
{
185173
var semVer = new SemanticVersion
@@ -251,8 +239,6 @@ public void ProvidesVariablesInContinuousDeploymentModeWithTagSetToUseBranchName
251239
}
252240

253241
[Test]
254-
[Category(NoMono)]
255-
[Description(NoMonoDescription)]
256242
public void ProvidesVariablesInContinuousDeliveryModeForFeatureBranch()
257243
{
258244
var semVer = new SemanticVersion
@@ -278,8 +264,6 @@ public void ProvidesVariablesInContinuousDeliveryModeForFeatureBranch()
278264
}
279265

280266
[Test]
281-
[Category(NoMono)]
282-
[Description(NoMonoDescription)]
283267
public void ProvidesVariablesInContinuousDeliveryModeForFeatureBranchWithCustomAssemblyInfoFormat()
284268
{
285269
var semVer = new SemanticVersion

‎src/GitVersion.Core.Tests/VersionConverters/AssemblyInfoFileUpdaterTests.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ public void Setup()
3535
[TestCase("cs")]
3636
[TestCase("fs")]
3737
[TestCase("vb")]
38-
[Category(NoMono)]
39-
[Description(NoMonoDescription)]
4038
public void ShouldCreateAssemblyInfoFileWhenNotExistsAndEnsureAssemblyInfo(string fileExtension)
4139
{
4240
var workingDir = Path.GetTempPath();
@@ -53,8 +51,6 @@ public void ShouldCreateAssemblyInfoFileWhenNotExistsAndEnsureAssemblyInfo(strin
5351
[TestCase("cs")]
5452
[TestCase("fs")]
5553
[TestCase("vb")]
56-
[Category(NoMono)]
57-
[Description(NoMonoDescription)]
5854
public void ShouldCreateAssemblyInfoFileAtPathWhenNotExistsAndEnsureAssemblyInfo(string fileExtension)
5955
{
6056
var workingDir = Path.GetTempPath();
@@ -71,8 +67,6 @@ public void ShouldCreateAssemblyInfoFileAtPathWhenNotExistsAndEnsureAssemblyInfo
7167
[TestCase("cs")]
7268
[TestCase("fs")]
7369
[TestCase("vb")]
74-
[Category(NoMono)]
75-
[Description(NoMonoDescription)]
7670
public void ShouldCreateAssemblyInfoFilesAtPathWhenNotExistsAndEnsureAssemblyInfo(string fileExtension)
7771
{
7872
var workingDir = Path.GetTempPath();
@@ -162,8 +156,6 @@ public void ShouldReplaceAssemblyVersion(string fileExtension, string assemblyFi
162156
[TestCase("cs", "[assembly: AssemblyFileVersion(\"1.0.0.0\")]")]
163157
[TestCase("fs", "[<assembly: AssemblyFileVersion(\"1.0.0.0\")>]")]
164158
[TestCase("vb", "<Assembly: AssemblyFileVersion(\"1.0.0.0\")>")]
165-
[Category(NoMono)]
166-
[Description(NoMonoDescription)]
167159
public void ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone(string fileExtension, string assemblyFileContent)
168160
{
169161
var workingDir = Path.GetTempPath();
@@ -375,8 +367,6 @@ public void ShouldReplaceAssemblyVersionInRelativePathWithVariablesAndWhiteSpace
375367
[TestCase("cs", "[assembly: AssemblyVersion(\"1.0.0.0\")]\r\n[assembly: AssemblyFileVersion(\"1.0.0.0\")]")]
376368
[TestCase("fs", "[<assembly: AssemblyVersion(\"1.0.0.0\")>]\r\n[<assembly: AssemblyFileVersion(\"1.0.0.0\")>]")]
377369
[TestCase("vb", "<Assembly: AssemblyVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyFileVersion(\"1.0.0.0\")>")]
378-
[Category(NoMono)]
379-
[Description(NoMonoDescription)]
380370
public void ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile(string fileExtension, string assemblyFileContent)
381371
{
382372
var workingDir = Path.GetTempPath();
@@ -396,8 +386,6 @@ public void ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile
396386
[TestCase("cs", "[assembly: AssemblyVersion(\"1.0.0.0\")]\r\n[assembly: AssemblyFileVersion(\"1.0.0.0\")]\r\n// comment\r\n")]
397387
[TestCase("fs", "[<assembly: AssemblyVersion(\"1.0.0.0\")>]\r\n[<assembly: AssemblyFileVersion(\"1.0.0.0\")>]\r\ndo\r\n()\r\n")]
398388
[TestCase("vb", "<Assembly: AssemblyVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyFileVersion(\"1.0.0.0\")>\r\n' comment\r\n")]
399-
[Category(NoMono)]
400-
[Description(NoMonoDescription)]
401389
public void Issue1183ShouldAddFSharpAssemblyInformationalVersionBesideOtherAttributes(string fileExtension, string assemblyFileContent)
402390
{
403391
var workingDir = Path.GetTempPath();
@@ -417,8 +405,6 @@ public void Issue1183ShouldAddFSharpAssemblyInformationalVersionBesideOtherAttri
417405
[TestCase("cs", "[assembly: AssemblyFileVersion(\"1.0.0.0\")]")]
418406
[TestCase("fs", "[<assembly: AssemblyFileVersion(\"1.0.0.0\")>]")]
419407
[TestCase("vb", "<Assembly: AssemblyFileVersion(\"1.0.0.0\")>")]
420-
[Category(NoMono)]
421-
[Description(NoMonoDescription)]
422408
public void ShouldNotAddAssemblyInformationalVersionWhenVersionSchemeIsNone(string fileExtension, string assemblyFileContent)
423409
{
424410
var workingDir = Path.GetTempPath();

‎src/GitVersion.Core.Tests/VersionConverters/GitVersionInfoGeneratorTests.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ public class GitVersionInfoGeneratorTests : TestBase
1818
[TestCase("cs")]
1919
[TestCase("fs")]
2020
[TestCase("vb")]
21-
[Category(NoMono)]
22-
[Description(NoMonoDescription)]
2321
public void ShouldCreateFile(string fileExtension)
2422
{
2523
var directory = Path.GetTempPath();

‎src/GitVersion.Core.Tests/VersionConverters/ProjectFileUpdaterTests.cs

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ public void Setup()
3737
this.projectFileUpdater = new ProjectFileUpdater(this.log, this.fileSystem);
3838
}
3939

40-
[Category(NoMono)]
41-
[Description(NoMonoDescription)]
4240
[TestCase("Microsoft.NET.Sdk")]
4341
[TestCase("Microsoft.NET.Sdk.Worker")]
4442
[TestCase("Microsoft.NET.Sdk.Web")]
@@ -69,8 +67,6 @@ public void CanUpdateProjectFileWithSdkProjectFileXml(string sdk)
6967
</PropertyGroup>
7068
</Project>
7169
")]
72-
[Category(NoMono)]
73-
[Description(NoMonoDescription)]
7470
public void CannotUpdateProjectFileWithIncorrectProjectSdk(string xml)
7571
{
7672
var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));
@@ -90,8 +86,6 @@ public void CannotUpdateProjectFileWithIncorrectProjectSdk(string xml)
9086
</PropertyGroup>
9187
</Project>
9288
")]
93-
[Category(NoMono)]
94-
[Description(NoMonoDescription)]
9589
public void CannotUpdateProjectFileWithMissingProjectSdk(string xml)
9690
{
9791
var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));
@@ -112,8 +106,6 @@ public void CannotUpdateProjectFileWithMissingProjectSdk(string xml)
112106
</PropertyGroup>
113107
</Project>
114108
")]
115-
[Category(NoMono)]
116-
[Description(NoMonoDescription)]
117109
public void CannotUpdateProjectFileWithoutAssemblyInfoGeneration(string xml)
118110
{
119111
var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));
@@ -129,8 +121,6 @@ public void CannotUpdateProjectFileWithoutAssemblyInfoGeneration(string xml)
129121
<Project Sdk=""Microsoft.NET.Sdk"">
130122
</Project>
131123
")]
132-
[Category(NoMono)]
133-
[Description(NoMonoDescription)]
134124
public void CannotUpdateProjectFileWithoutAPropertyGroup(string xml)
135125
{
136126
var canUpdate = projectFileUpdater.CanUpdateProjectFile(XElement.Parse(xml));
@@ -150,8 +140,6 @@ public void CannotUpdateProjectFileWithoutAPropertyGroup(string xml)
150140
</PropertyGroup>
151141
</Project>"
152142
)]
153-
[Category(NoMono)]
154-
[Description(NoMonoDescription)]
155143
public void UpdateProjectXmlVersionElementWithStandardXmlInsertsElement(string xml)
156144
{
157145
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("2.0.0", "v"), new TestEffectiveConfiguration(), false);
@@ -179,8 +167,6 @@ public void UpdateProjectXmlVersionElementWithStandardXmlInsertsElement(string x
179167
</PropertyGroup>
180168
</Project>"
181169
)]
182-
[Category(NoMono)]
183-
[Description(NoMonoDescription)]
184170
public void UpdateProjectXmlVersionElementWithStandardXmlModifiesElement(string xml)
185171
{
186172
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("2.0.0", "v"), new TestEffectiveConfiguration(), false);
@@ -211,8 +197,6 @@ public void UpdateProjectXmlVersionElementWithStandardXmlModifiesElement(string
211197
</PropertyGroup>
212198
</Project>"
213199
)]
214-
[Category(NoMono)]
215-
[Description(NoMonoDescription)]
216200
public void UpdateProjectXmlVersionElementWithDuplicatePropertyGroupsModifiesLastElement(string xml)
217201
{
218202
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("2.0.0", "v"), new TestEffectiveConfiguration(), false);
@@ -244,8 +228,6 @@ public void UpdateProjectXmlVersionElementWithDuplicatePropertyGroupsModifiesLas
244228
</PropertyGroup>
245229
</Project>"
246230
)]
247-
[Category(NoMono)]
248-
[Description(NoMonoDescription)]
249231
public void UpdateProjectXmlVersionElementWithMultipleVersionElementsLastOneIsModified(string xml)
250232
{
251233
var variables = this.variableProvider.GetVariablesFor(SemanticVersion.Parse("2.0.0", "v"), new TestEffectiveConfiguration(), false);
@@ -272,8 +254,6 @@ public void UpdateProjectXmlVersionElementWithMultipleVersionElementsLastOneIsMo
272254
<TargetFramework>netcoreapp3.1</TargetFramework>
273255
</PropertyGroup>
274256
</Project>")]
275-
[Category(NoMono)]
276-
[Description(NoMonoDescription)]
277257
public void UpdateProjectFileAddsVersionToFile(string xml)
278258
{
279259
var fileName = PathHelper.Combine(Path.GetTempPath(), "TestProject.csproj");

‎src/GitVersion.Core.Tests/VersionConverters/WixFileTests.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ internal class WixFileTests : TestBase
1717
public void Setup() => ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestAttribute>();
1818

1919
[Test]
20-
[Category(NoMono)]
21-
[Description(NoMonoDescription)]
2220
public void UpdateWixVersionFile()
2321
{
2422
var workingDir = Path.GetTempPath();
@@ -60,8 +58,6 @@ public void UpdateWixVersionFile()
6058
}
6159

6260
[Test]
63-
[Category(NoMono)]
64-
[Description(NoMonoDescription)]
6561
public void UpdateWixVersionFileWhenFileAlreadyExists()
6662
{
6763
var workingDir = Path.GetTempPath();

‎src/GitVersion.MsBuild.Tests/Tasks/GenerateGitVersionInformationTest.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ public void GenerateGitVersionInformationTaskShouldCreateFileInBuildServer()
5252

5353
[Test]
5454
[Category(NoNet48)]
55-
[Category(NoMono)]
56-
public void GenerateGitVersionInformationTaskShouldCreateFileWhenRunWithMsBuild()
55+
public void GenerateGitVersionInformationTaskShouldCreateFileWhenRunWithMsBuild()
5756
{
5857
const string taskName = nameof(GenerateGitVersionInformation);
5958
const string outputProperty = nameof(GenerateGitVersionInformation.GitVersionInformationFilePath);
@@ -79,8 +78,7 @@ public void GenerateGitVersionInformationTaskShouldCreateFileWhenRunWithMsBuild(
7978

8079
[Test]
8180
[Category(NoNet48)]
82-
[Category(NoMono)]
83-
public void GenerateGitVersionInformationTaskShouldCreateFileWhenRunWithMsBuildInBuildServer()
81+
public void GenerateGitVersionInformationTaskShouldCreateFileWhenRunWithMsBuildInBuildServer()
8482
{
8583
const string taskName = nameof(GenerateGitVersionInformation);
8684
const string outputProperty = nameof(GenerateGitVersionInformation.GitVersionInformationFilePath);

‎src/GitVersion.MsBuild.Tests/Tasks/GetVersionTaskTests.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ public void GetVersionTaskShouldReturnVersionOutputVariablesForBuildServer()
6262
[TestCase(nameof(VersionVariables.MajorMinorPatch), "1.2.4")]
6363
[TestCase(nameof(VersionVariables.FullSemVer), "1.2.4+1")]
6464
[Category(NoNet48)]
65-
[Category(NoMono)]
66-
public void GetVersionTaskShouldReturnVersionOutputVariablesWhenRunWithMsBuild(string outputProperty, string version)
65+
public void GetVersionTaskShouldReturnVersionOutputVariablesWhenRunWithMsBuild(string outputProperty, string version)
6766
{
6867
const string taskName = nameof(GetVersion);
6968

@@ -83,8 +82,7 @@ public void GetVersionTaskShouldReturnVersionOutputVariablesWhenRunWithMsBuild(s
8382
[TestCase(nameof(VersionVariables.MajorMinorPatch), "1.0.1")]
8483
[TestCase(nameof(VersionVariables.FullSemVer), "1.0.1+1")]
8584
[Category(NoNet48)]
86-
[Category(NoMono)]
87-
public void GetVersionTaskShouldReturnVersionOutputVariablesWhenRunWithMsBuildInBuildServer(string outputProperty, string version)
85+
public void GetVersionTaskShouldReturnVersionOutputVariablesWhenRunWithMsBuildInBuildServer(string outputProperty, string version)
8886
{
8987
const string taskName = nameof(GetVersion);
9088

0 commit comments

Comments
 (0)