diff --git a/GitVersion.yml b/GitVersion.yml index 9075e6d..6dd441a 100644 --- a/GitVersion.yml +++ b/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 diff --git a/TestCentric.Metadata.sln b/TestCentric.Metadata.sln index 9387e40..572e13b 100644 --- a/TestCentric.Metadata.sln +++ b/TestCentric.Metadata.sln @@ -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}" @@ -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 diff --git a/build.cake b/build.cake index f8431ca..a79b753 100644 --- a/build.cake +++ b/build.cake @@ -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") })); ////////////////////////////////////////////////////////////////////// diff --git a/packaging/tests/nuget/TestCentric.Metadata.2.0.1-ci00010-issue-23/lib/net40/TestCentric.Metadata.dll b/packaging/tests/nuget/TestCentric.Metadata.2.0.1-ci00010-issue-23/lib/net40/TestCentric.Metadata.dll deleted file mode 100644 index bf631a9..0000000 Binary files a/packaging/tests/nuget/TestCentric.Metadata.2.0.1-ci00010-issue-23/lib/net40/TestCentric.Metadata.dll and /dev/null differ diff --git a/packaging/tests/nuget/TestCentric.Metadata.2.0.1-ci00010-issue-23/lib/netstandard1.6/TestCentric.Metadata.dll b/packaging/tests/nuget/TestCentric.Metadata.2.0.1-ci00010-issue-23/lib/netstandard1.6/TestCentric.Metadata.dll deleted file mode 100644 index eba9cad..0000000 Binary files a/packaging/tests/nuget/TestCentric.Metadata.2.0.1-ci00010-issue-23/lib/netstandard1.6/TestCentric.Metadata.dll and /dev/null differ diff --git a/packaging/tests/nuget/TestCentric.Metadata.2.0.1-ci00010-issue-23/LICENSE b/packaging/tests/nuget/TestCentric.Metadata.3.0.0-ci00012-issue-24/LICENSE similarity index 100% rename from packaging/tests/nuget/TestCentric.Metadata.2.0.1-ci00010-issue-23/LICENSE rename to packaging/tests/nuget/TestCentric.Metadata.3.0.0-ci00012-issue-24/LICENSE diff --git a/packaging/tests/nuget/TestCentric.Metadata.2.0.1-ci00010-issue-23/NOTICE.md b/packaging/tests/nuget/TestCentric.Metadata.3.0.0-ci00012-issue-24/NOTICE.md similarity index 100% rename from packaging/tests/nuget/TestCentric.Metadata.2.0.1-ci00010-issue-23/NOTICE.md rename to packaging/tests/nuget/TestCentric.Metadata.3.0.0-ci00012-issue-24/NOTICE.md diff --git a/packaging/tests/nuget/TestCentric.Metadata.2.0.1-ci00010-issue-23/README.md b/packaging/tests/nuget/TestCentric.Metadata.3.0.0-ci00012-issue-24/README.md similarity index 100% rename from packaging/tests/nuget/TestCentric.Metadata.2.0.1-ci00010-issue-23/README.md rename to packaging/tests/nuget/TestCentric.Metadata.3.0.0-ci00012-issue-24/README.md diff --git a/packaging/tests/nuget/TestCentric.Metadata.2.0.1-ci00010-issue-23/lib/net20/TestCentric.Metadata.dll b/packaging/tests/nuget/TestCentric.Metadata.3.0.0-ci00012-issue-24/lib/net20/TestCentric.Metadata.dll similarity index 99% rename from packaging/tests/nuget/TestCentric.Metadata.2.0.1-ci00010-issue-23/lib/net20/TestCentric.Metadata.dll rename to packaging/tests/nuget/TestCentric.Metadata.3.0.0-ci00012-issue-24/lib/net20/TestCentric.Metadata.dll index 635d4e3..1f9b690 100644 Binary files a/packaging/tests/nuget/TestCentric.Metadata.2.0.1-ci00010-issue-23/lib/net20/TestCentric.Metadata.dll and b/packaging/tests/nuget/TestCentric.Metadata.3.0.0-ci00012-issue-24/lib/net20/TestCentric.Metadata.dll differ diff --git a/packaging/tests/nuget/TestCentric.Metadata.2.0.1-ci00010-issue-23/lib/netstandard2.0/TestCentric.Metadata.dll b/packaging/tests/nuget/TestCentric.Metadata.3.0.0-ci00012-issue-24/lib/netstandard2.0/TestCentric.Metadata.dll similarity index 99% rename from packaging/tests/nuget/TestCentric.Metadata.2.0.1-ci00010-issue-23/lib/netstandard2.0/TestCentric.Metadata.dll rename to packaging/tests/nuget/TestCentric.Metadata.3.0.0-ci00012-issue-24/lib/netstandard2.0/TestCentric.Metadata.dll index d85b68a..afad918 100644 Binary files a/packaging/tests/nuget/TestCentric.Metadata.2.0.1-ci00010-issue-23/lib/netstandard2.0/TestCentric.Metadata.dll and b/packaging/tests/nuget/TestCentric.Metadata.3.0.0-ci00012-issue-24/lib/netstandard2.0/TestCentric.Metadata.dll differ diff --git a/packaging/tests/nuget/TestCentric.Metadata.2.0.1-ci00010-issue-23/testcentric.png b/packaging/tests/nuget/TestCentric.Metadata.3.0.0-ci00012-issue-24/testcentric.png similarity index 100% rename from packaging/tests/nuget/TestCentric.Metadata.2.0.1-ci00010-issue-23/testcentric.png rename to packaging/tests/nuget/TestCentric.Metadata.3.0.0-ci00012-issue-24/testcentric.png diff --git a/src/TestCentric.Metadata.tests/AssemblyTests.cs b/src/TestCentric.Metadata.tests/AssemblyTests.cs index 6559a22..a03d414 100644 --- a/src/TestCentric.Metadata.tests/AssemblyTests.cs +++ b/src/TestCentric.Metadata.tests/AssemblyTests.cs @@ -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 @@ -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 diff --git a/src/TestCentric.Metadata.tests/TestCentric.Metadata.Tests.csproj b/src/TestCentric.Metadata.tests/TestCentric.Metadata.Tests.csproj index c0d7ebf..0c5a96e 100644 --- a/src/TestCentric.Metadata.tests/TestCentric.Metadata.Tests.csproj +++ b/src/TestCentric.Metadata.tests/TestCentric.Metadata.Tests.csproj @@ -1,7 +1,7 @@  - net35;netcoreapp3.1;net5.0;net6.0;net7.0 + net35;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0 false TestCentric.Metadata Exe diff --git a/src/TestCentric.Metadata/TestCentric.Metadata.csproj b/src/TestCentric.Metadata/TestCentric.Metadata.csproj index 58957b9..1628def 100644 --- a/src/TestCentric.Metadata/TestCentric.Metadata.csproj +++ b/src/TestCentric.Metadata/TestCentric.Metadata.csproj @@ -2,7 +2,7 @@ TestCentric.Metadata - net20;net40;netstandard1.6;netstandard2.0 + net20;netstandard2.0 true testcentric.snk ..\..\bin\$(Configuration)\