Skip to content

Commit

Permalink
Eliminate .NET Standard 1.6 and .NET 4.0 builds; add tests under .NET…
Browse files Browse the repository at this point in the history
… 8.0
  • Loading branch information
CharliePoole committed Dec 28, 2023
1 parent 84e517b commit 52e4b28
Show file tree
Hide file tree
Showing 14 changed files with 7 additions and 17 deletions.
2 changes: 1 addition & 1 deletion GitVersion.yml
@@ -1,4 +1,4 @@
next-version: 2.0.0
next-version: 3.0.0
mode: ContinuousDelivery
legacy-semver-padding: 5
build-metadata-padding: 5
Expand Down
6 changes: 0 additions & 6 deletions TestCentric.Metadata.sln
Expand Up @@ -15,11 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
versioning.cake = versioning.cake
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{A6EB94CC-A287-4D4E-9D5C-FBA337E29008}"
ProjectSection(SolutionItems) = preProject
nuget\TestCentric.Metadata.nuspec = nuget\TestCentric.Metadata.nuspec
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestCentric.Metadata", "src\TestCentric.Metadata\TestCentric.Metadata.csproj", "{DF453857-44BB-44CF-BEC5-47F8C83335E5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestCentric.Metadata.Tests", "src\TestCentric.Metadata.tests\TestCentric.Metadata.Tests.csproj", "{5D6A67A0-B74C-48F1-8FCC-E85BF727F0B3}"
Expand All @@ -43,7 +38,6 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{A6EB94CC-A287-4D4E-9D5C-FBA337E29008} = {96693C7E-4547-491A-BF05-865897ACF46C}
{DF453857-44BB-44CF-BEC5-47F8C83335E5} = {96693C7E-4547-491A-BF05-865897ACF46C}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
Expand Down
4 changes: 0 additions & 4 deletions build.cake
Expand Up @@ -26,14 +26,10 @@ BuildSettings.Packages.Add(new NuGetPackage(
HasFiles(
"LICENSE", "README.md", "NOTICE.md", "testcentric.png",
"lib/net20/TestCentric.Metadata.dll",
"lib/net40/TestCentric.Metadata.dll",
"lib/netstandard1.6/TestCentric.Metadata.dll",
"lib/netstandard2.0/TestCentric.Metadata.dll") },
symbols: new PackageCheck[] {
HasFiles(
"lib/net20/TestCentric.Metadata.pdb",
"lib/net40/TestCentric.Metadata.pdb",
"lib/netstandard1.6/TestCentric.Metadata.pdb",
"lib/netstandard2.0/TestCentric.Metadata.pdb") }));

//////////////////////////////////////////////////////////////////////
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
8 changes: 4 additions & 4 deletions src/TestCentric.Metadata.tests/AssemblyTests.cs
Expand Up @@ -46,10 +46,8 @@ public void GetFrameworkName()
{
#if NET35
Assert.That(_assemblyDef.GetFrameworkName(), Is.EqualTo(null));
#elif NET40
Assert.That(_assemblyDef.GetFrameworkName(), Is.EqualTo(".NETFramework,Version=v4.0"));
#elif NET45
Assert.That(_assemblyDef.GetFrameworkName(), Is.EqualTo(".NETFramework,Version=v4.5"));
#elif NET481
Assert.That(_assemblyDef.GetFrameworkName(), Is.EqualTo(".NETFramework,Version=v4.8.1"));
#elif NETCOREAPP2_1
Assert.That(_assemblyDef.GetFrameworkName(), Is.EqualTo(".NETCoreApp,Version=v2.1"));
#elif NETCOREAPP3_1
Expand All @@ -60,6 +58,8 @@ public void GetFrameworkName()
Assert.That(_assemblyDef.GetFrameworkName(), Is.EqualTo(".NETCoreApp,Version=v6.0"));
#elif NET7_0
Assert.That(_assemblyDef.GetFrameworkName(), Is.EqualTo(".NETCoreApp,Version=v7.0"));
#elif NET8_0
Assert.That(_assemblyDef.GetFrameworkName(), Is.EqualTo(".NETCoreApp,Version=v8.0"));
#else
Assert.Fail($"Untested target runtime: {_assemblyDef.GetFrameworkName()}");
#endif
Expand Down
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net35;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net35;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<RootNamespace>TestCentric.Metadata</RootNamespace>
<OutputType>Exe</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion src/TestCentric.Metadata/TestCentric.Metadata.csproj
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<RootNamespace>TestCentric.Metadata</RootNamespace>
<TargetFrameworks>net20;net40;netstandard1.6;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net20;netstandard2.0</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>testcentric.snk</AssemblyOriginatorKeyFile>
<OutputPath>..\..\bin\$(Configuration)\</OutputPath>
Expand Down

0 comments on commit 52e4b28

Please sign in to comment.