Skip to content

Commit b5b7f62

Browse files
committed
(build) remove workaround for .netcoreapp 3.1 tests
1 parent 67494ec commit b5b7f62

File tree

7 files changed

+0
-16
lines changed

7 files changed

+0
-16
lines changed

build/build/Tasks/Test/UnitTest.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,6 @@ private static void TestProjectForTarget(BuildContext context, FilePath project,
8888
Exclude = new List<string> { "[GitVersion*.Tests]*", "[GitTools.Testing]*" }
8989
};
9090

91-
if (string.Equals(framework, Constants.CoreFxVersion31))
92-
{
93-
// settings.Filter = $"TestCategory!={Constants.NoNetCoreApp31}";
94-
}
95-
9691
if (string.Equals(framework, Constants.FullFxVersion48))
9792
{
9893
settings.Filter = context.IsRunningOnUnix() ? $"TestCategory!={Constants.NoMono}" : $"TestCategory!={Constants.NoNet48}";

build/common/Utilities/Constants.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ public class Constants
1616

1717
public const string NoMono = "NoMono";
1818
public const string NoNet48 = "NoNet48";
19-
public const string NoNetCoreApp31 = "NoNetCoreApp31";
2019

2120
public static readonly string[] VersionsToBuild = { Version60, Version50, Version31 };
2221
public static readonly Architecture[] ArchToBuild = { Architecture.Amd64, Architecture.Arm64 };

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ public class TestBase
1111
protected const string NoMonoDescription = "Won't run on Mono due to source information not being available for ShouldMatchApproved.";
1212
protected const string NoMono = "NoMono";
1313
protected const string NoNet48 = "NoNet48";
14-
protected const string NoNetCoreApp31 = "NoNetCoreApp31";
1514
public const string MainBranch = "main";
1615

1716
protected static IServiceProvider ConfigureServices(Action<IServiceCollection> overrideServices = null)

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ public void GenerateGitVersionInformationTaskShouldCreateFileInBuildServer()
5050
}
5151

5252
[Test]
53-
[Category(NoNetCoreApp31)]
5453
[Category(NoNet48)]
5554
[Category(NoMono)]
5655
public void GenerateGitVersionInformationTaskShouldCreateFileWhenRunWithMsBuild()
@@ -78,7 +77,6 @@ public void GenerateGitVersionInformationTaskShouldCreateFileWhenRunWithMsBuild(
7877
}
7978

8079
[Test]
81-
[Category(NoNetCoreApp31)]
8280
[Category(NoNet48)]
8381
[Category(NoMono)]
8482
public void GenerateGitVersionInformationTaskShouldCreateFileWhenRunWithMsBuildInBuildServer()

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ public void GetVersionTaskShouldReturnVersionOutputVariablesForBuildServer()
6161
[TestCase(nameof(VersionVariables.Patch), "4")]
6262
[TestCase(nameof(VersionVariables.MajorMinorPatch), "1.2.4")]
6363
[TestCase(nameof(VersionVariables.FullSemVer), "1.2.4+1")]
64-
[Category(NoNetCoreApp31)]
6564
[Category(NoNet48)]
6665
[Category(NoMono)]
6766
public void GetVersionTaskShouldReturnVersionOutputVariablesWhenRunWithMsBuild(string outputProperty, string version)
@@ -83,7 +82,6 @@ public void GetVersionTaskShouldReturnVersionOutputVariablesWhenRunWithMsBuild(s
8382
[TestCase(nameof(VersionVariables.Patch), "1")]
8483
[TestCase(nameof(VersionVariables.MajorMinorPatch), "1.0.1")]
8584
[TestCase(nameof(VersionVariables.FullSemVer), "1.0.1+1")]
86-
[Category(NoNetCoreApp31)]
8785
[Category(NoNet48)]
8886
[Category(NoMono)]
8987
public void GetVersionTaskShouldReturnVersionOutputVariablesWhenRunWithMsBuildInBuildServer(string outputProperty, string version)

src/GitVersion.MsBuild.Tests/Tasks/UpdateAssemblyInfoTaskTest.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ public void UpdateAssemblyInfoTaskShouldCreateFileInBuildServer()
4141
}
4242

4343
[Test]
44-
[Category(NoNetCoreApp31)]
4544
[Category(NoNet48)]
4645
[Category(NoMono)]
4746
public void UpdateAssemblyInfoTaskShouldCreateFileWhenRunWithMsBuild()
@@ -65,7 +64,6 @@ public void UpdateAssemblyInfoTaskShouldCreateFileWhenRunWithMsBuild()
6564
}
6665

6766
[Test]
68-
[Category(NoNetCoreApp31)]
6967
[Category(NoNet48)]
7068
[Category(NoMono)]
7169
public void UpdateAssemblyInfoTaskShouldCreateFileWhenRunWithMsBuildInBuildServer()

src/GitVersion.MsBuild.Tests/Tasks/WriteVersionInfoTest.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ public void WriteVersionInfoTaskShouldUpdateBuildNumberInAzurePipeline(string bu
8080

8181

8282
[Test]
83-
[Category(NoNetCoreApp31)]
8483
public void WriteVersionInfoTaskShouldLogOutputVariablesToBuildOutputInGitHubActions()
8584
{
8685
var task = new WriteVersionInfoToBuildLog();
@@ -94,7 +93,6 @@ public void WriteVersionInfoTaskShouldLogOutputVariablesToBuildOutputInGitHubAct
9493
}
9594

9695
[Test]
97-
[Category(NoNetCoreApp31)]
9896
[Category(NoNet48)]
9997
[Category(NoMono)]
10098
public void WriteVersionInfoTaskShouldNotLogOutputVariablesToBuildOutputWhenRunWithMsBuild()
@@ -112,7 +110,6 @@ public void WriteVersionInfoTaskShouldNotLogOutputVariablesToBuildOutputWhenRunW
112110
}
113111

114112
[Test]
115-
[Category(NoNetCoreApp31)]
116113
[Category(NoNet48)]
117114
[Category(NoMono)]
118115
public void WriteVersionInfoTaskShouldLogOutputVariablesToBuildOutputWhenRunWithMsBuildInAzurePipeline()

0 commit comments

Comments
 (0)