diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 832653a9..a068340c 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -4,5 +4,5 @@ When reporting a bug, please provide the following information to speed up triag * Visual Studio edition and full version number (see Help About) * A short repro, preferably attached or pointing to a git repo or gist * What .net platform and version is being targeted -* If TFS/VSTS issue, what version, hosted, on-premises, and what build task you see this in +* If TFS/VSTS issue, what version, hosted or on-premises, and what build task you see this in diff --git a/NUnit3TestAdapter.sln b/NUnit3TestAdapter.sln index e8ca1a50..d212d540 100644 --- a/NUnit3TestAdapter.sln +++ b/NUnit3TestAdapter.sln @@ -17,7 +17,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution LICENSE.txt = LICENSE.txt src\native-assembly\NativeTests.dll = src\native-assembly\NativeTests.dll NuGet.Config = NuGet.Config - .github\workflows\NUnit3TestAdapter.Cake.CI.yml = .github\workflows\NUnit3TestAdapter.Cake.CI.yml NUnit3TestAdapter.sln.DotSettings = NUnit3TestAdapter.sln.DotSettings images\nunit_256.png = images\nunit_256.png Osiris.Extended.ruleset = Osiris.Extended.ruleset @@ -51,6 +50,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "netcoreapp2.1", "netcoreapp EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit.TestAdapter.Tests.Acceptance", "src\NUnit.TestAdapter.Tests.Acceptance\NUnit.TestAdapter.Tests.Acceptance.csproj", "{3FAC7EE0-664F-4B11-918B-8E0FF865EE4C}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "github", "github", "{062B1763-73C8-4B5A-92DF-C66A36C43CE1}" + ProjectSection(SolutionItems) = preProject + .github\dependabot.yml = .github\dependabot.yml + .github\ISSUE_TEMPLATE.md = .github\ISSUE_TEMPLATE.md + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{7D708804-B2F1-4A31-A9FB-85A0C7433200}" + ProjectSection(SolutionItems) = preProject + .github\workflows\NUnit3TestAdapter.Cake.CI.yml = .github\workflows\NUnit3TestAdapter.Cake.CI.yml + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -88,6 +98,8 @@ Global GlobalSection(NestedProjects) = preSolution {D41249E3-C080-4B66-8CBD-99CE4D309A10} = {DE347D88-F6ED-4031-AFC2-318F63E39BC9} {A9584E41-6ECE-44B4-A504-41795A65DA5F} = {DE347D88-F6ED-4031-AFC2-318F63E39BC9} + {062B1763-73C8-4B5A-92DF-C66A36C43CE1} = {7CE30108-5D81-4850-BE6B-C8BCA35D3592} + {7D708804-B2F1-4A31-A9FB-85A0C7433200} = {062B1763-73C8-4B5A-92DF-C66A36C43CE1} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8EF03474-188E-44A8-8C76-9FBCF9A382EC} diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ebce5733..b361fb26 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -11,19 +11,6 @@ jobs: - powershell: .\build.ps1 --target=CI --configuration=$(BuildConfiguration) displayName: Build, package, and test - - task: PublishBuildArtifacts@1 - displayName: Publish bin artifacts - inputs: - PathtoPublish: $(build.sourcesdirectory)\bin\$(BuildConfiguration) - ArtifactName: Bin - condition: succeededOrFailed() - - - task: PublishBuildArtifacts@1 - displayName: Publish package artifacts - inputs: - PathtoPublish: $(build.sourcesdirectory)\package - ArtifactName: Package - condition: succeededOrFailed() - job: Linux pool: diff --git a/build.cake b/build.cake index be5a2324..d71d987e 100644 --- a/build.cake +++ b/build.cake @@ -12,8 +12,8 @@ var configuration = Argument("configuration", "Release"); // SET PACKAGE VERSION ////////////////////////////////////////////////////////////////////// -var version = "4.1.0"; -var modifier = ""; +var version = "4.2.0"; +var modifier = "-alpha.1"; var dbgSuffix = configuration.ToLower() == "debug" ? "-dbg" : ""; var packageVersion = version + modifier + dbgSuffix; diff --git a/src/NUnitTestAdapter/NUnitEngine/DiscoveryConverter.cs b/src/NUnitTestAdapter/NUnitEngine/DiscoveryConverter.cs index ce10ab61..9473a515 100644 --- a/src/NUnitTestAdapter/NUnitEngine/DiscoveryConverter.cs +++ b/src/NUnitTestAdapter/NUnitEngine/DiscoveryConverter.cs @@ -282,8 +282,16 @@ private void ExtractTestFixtures(NUnitDiscoveryCanHaveTestFixture parent, XEleme ExtractTestFixtures(ptf, child); } break; + case GenericFixture: + var gf = ExtractGenericTestFixture(parent, node); + parent.AddTestGenericFixture(gf); + if (child.HasElements) + { + ExtractTestFixtures(gf, child); + } + break; default: - throw new DiscoveryException($"Not a TestFixture, SetUpFixture, ParameterizedFixture or TestSuite, but {type}"); + throw new DiscoveryException($"Not a TestFixture, SetUpFixture, ParameterizedFixture, GenericFixture or TestSuite, but {type}"); } } } diff --git a/src/NUnitTestAdapter/Properties/AssemblyInfo.cs b/src/NUnitTestAdapter/Properties/AssemblyInfo.cs index 8d6e7267..448763b5 100644 --- a/src/NUnitTestAdapter/Properties/AssemblyInfo.cs +++ b/src/NUnitTestAdapter/Properties/AssemblyInfo.cs @@ -9,7 +9,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyTitle("NUnit3 Test Adapter for Visual Studio")] -[assembly: AssemblyDescription("A package containing the NUnit3 TestAdapter for Visual Studio 2012 onwards. With this package you don't need to install the VSIX adapter package, and you don't need to upload the adapter to your Azure DevOps server.\r\n \r\nNote that this package ONLY contains the adapter, not the NUnit framework. You must also get the framework.\r\n\r\nThe package works with Visual Studio 2012 and newer.\r\n")] +[assembly: AssemblyDescription("A package containing the NUnit3 TestAdapter for Visual Studio 2012 onwards. \n\r\nThe package works with Visual Studio 2012 and newer, dotnet test and VSTest.Console.\r\n")] [assembly: AssemblyCompany("NUnit Project")] [assembly: AssemblyProduct("NUnit3TestAdapter")] [assembly: AssemblyCopyright("Copyright © 2011-2021 Charlie Poole, 2014-2021 Terje Sandstrom")] @@ -21,7 +21,7 @@ [assembly: ComVisible(false)] [assembly: Guid("c0aad5e4-b486-49bc-b3e8-31e01be6fefe")] -[assembly: AssemblyVersion("4.1.0.0")] -[assembly: AssemblyFileVersion("4.1.0.0")] +[assembly: AssemblyVersion("4.2.0.0")] +[assembly: AssemblyFileVersion("4.2.0.0")] [assembly: InternalsVisibleTo("NUnit.VisualStudio.TestAdapter.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010029b97dea816272cc4ea44cf3cf666f8150d6dfe1274b6c2e6c4d54259b756888ec08ad6dd3ea0f540b30408b948ae5f39cf0c7b210abdec267b367ce1eccab97d5c6c02ee67090827ffd699544fa2add4849b45a1901eac08495bfee0397fba3946ff3912ce0b9a497818e418a77a0c8db4ca1780e7b6f6dd6911395fcc0faba")] diff --git a/src/NUnitTestAdapterTests/NUnitEngineTests/NUnitDiscoveryTests.cs b/src/NUnitTestAdapterTests/NUnitEngineTests/NUnitDiscoveryTests.cs index 6bea784f..99d3f81d 100644 --- a/src/NUnitTestAdapterTests/NUnitEngineTests/NUnitDiscoveryTests.cs +++ b/src/NUnitTestAdapterTests/NUnitEngineTests/NUnitDiscoveryTests.cs @@ -1120,16 +1120,6 @@ public void ThatSetUpFixtureWorksIssue824() @" - - - - - - - - - - @@ -1159,6 +1149,34 @@ public void ThatSetUpFixtureWorksIssue884() Assert.That(ndr, Is.Not.Null); } + private const string GenericIssue918 = @" + + + + + + + + + + + + + + + + +"; + + [Test] + public void ThatGenericFixturesWorksIssue918() + { + var sut = new DiscoveryConverter(logger, settings); + var ndr = sut.ConvertXml( + new NUnitResults(XmlHelper.CreateXmlNode(GenericIssue918))); + Assert.That(ndr, Is.Not.Null); + } + private const string ExtractFixturesHandlesProperties = @" diff --git a/src/NUnitTestAdapterTests/ProjectTests.cs b/src/NUnitTestAdapterTests/ProjectTests.cs index 6481dfec..73cd526e 100644 --- a/src/NUnitTestAdapterTests/ProjectTests.cs +++ b/src/NUnitTestAdapterTests/ProjectTests.cs @@ -1,5 +1,5 @@ // *********************************************************************** -// Copyright (c) 2011-2017 Charlie Poole, Terje Sandstrom +// Copyright (c) 2011-2017 Charlie Poole, 2014-2021 Terje Sandstrom // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -23,7 +23,6 @@ using System.IO; using System.Linq; using System.Reflection; -using System.Xml.Linq; using NUnit.Framework; namespace NUnit.VisualStudio.TestAdapter.Tests