Skip to content

Cleanup code #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CharliePoole merged 1 commit into from
May 8, 2025
Merged

Cleanup code #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="NUnit AppVeyor CI" value="https://ci.appveyor.com/nuget/nunit" />
<add key="NUnit MyGet Feed" value="https://www.myget.org/F/nunit/api/v3/index.json" />
<add key="NUnit Analyzers MyGet Feed" value="https://www.myget.org/F/nunit-analyzers/api/v3/index.json" protocolVersion="3" />
<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
</packageSources>
</configuration>
100 changes: 46 additions & 54 deletions build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Load the recipe
#load nuget:?package=NUnit.Cake.Recipe&version=1.5.0-alpha.1
#load nuget:?package=NUnit.Cake.Recipe&version=1.5.0-alpha.4
// Comment out above line and uncomment below for local tests of recipe changes
//#load ../NUnit.Cake.Recipe/recipe/*.cake

Expand All @@ -13,104 +13,96 @@ BuildSettings.Initialize
githubRepository: "net80-pluggable-agent"
);

var MockAssemblyResult1 = new ExpectedResult("Failed")
{
Total = 36,
Passed = 23,
Failed = 5,
Warnings = 1,
Inconclusive = 1,
Skipped = 7,
Assemblies = new ExpectedAssemblyResult[] { new ExpectedAssemblyResult("mock-assembly.dll") }
};

var MockAssemblyResult2 = new ExpectedResult("Failed")
{
Total = 37,
Passed = 23,
Failed = 5,
Warnings = 1,
Inconclusive = 1,
Skipped = 7,
Assemblies = new ExpectedAssemblyResult[] { new ExpectedAssemblyResult("mock-assembly.dll") }
};

var AspNetCoreResult = new ExpectedResult("Passed")
{
Total = 2,
Passed = 2,
Failed = 0,
Warnings = 0,
Inconclusive = 0,
Skipped = 0,
Assemblies = new ExpectedAssemblyResult[] { new ExpectedAssemblyResult("aspnetcore-test.dll") }
};

var WindowsFormsResult = new ExpectedResult("Passed")
{
Total = 2,
Passed = 2,
Failed = 0,
Warnings = 0,
Inconclusive = 0,
Skipped = 0,
Assemblies = new ExpectedAssemblyResult[] { new ExpectedAssemblyResult("windows-test.dll") }
};

var PackageTests = new PackageTest[] {
//new PackageTest(1, "NetCore11PackageTest")
//{
// Description = "Run mock-assembly.dll targeting .NET Core 1.1",
// Arguments = "tests/netcoreapp1.1/mock-assembly.dll",
// ExpectedResult = MockAssemblyResult1
// ExpectedResult = new ExpectedResult("Failed")
// {
// Total = 35, Passed = 21, Failed = 5, Warnings = 1, Inconclusive = 1, Skipped = 7,
// Assemblies = new ExpectedAssemblyResult[] { new ExpectedAssemblyResult("mock-assembly.dll") }
// }
//},
//new PackageTest(1, "NetCore21PackageTest")
//{
// Description = "Run mock-assembly.dll targeting .NET Core 2.1",
// Arguments = "tests/netcoreapp2.1/mock-assembly.dll",
// ExpectedResult = MockAssemblyResult2
// ExpectedResult = new ExpectedResult("Failed")
// {
// Total = 35, Passed = 21, Failed = 5, Warnings = 1, Inconclusive = 1, Skipped = 7,
// Assemblies = new ExpectedAssemblyResult[] { new ExpectedAssemblyResult("mock-assembly.dll") }
// }
//},
new PackageTest(1, "NetCore31PackageTest")
{
Description = "Run mock-assembly.dll targeting .NET Core 3.1",
Arguments = "testdata/netcoreapp3.1/mock-assembly.dll",
ExpectedResult = MockAssemblyResult2,
ExpectedResult = new ExpectedResult("Failed")
{
Total = 35, Passed = 21, Failed = 5, Warnings = 1, Inconclusive = 1, Skipped = 7,
Assemblies = new ExpectedAssemblyResult[] { new ExpectedAssemblyResult("mock-assembly.dll") }
}
},
//new PackageTest(1, "Net50PackageTest")
//{
// Description = "Run mock-assembly.dll targeting .NET 5.0",
// Arguments = "testdata/net5.0/mock-assembly.dll",
// ExpectedResult = MockAssemblyResult2,
// ExpectedResult = new ExpectedResult("Failed")
// {
// Total = 35, Passed = 21, Failed = 5, Warnings = 1, Inconclusive = 1, Skipped = 7,
// Assemblies = new ExpectedAssemblyResult[] { new ExpectedAssemblyResult("mock-assembly.dll") }
// }
//},
new PackageTest(1, "Net60PackageTest")
{
Description = "Run mock-assembly.dll targeting .NET 6.0",
Arguments = "testdata/net6.0/mock-assembly.dll",
ExpectedResult = MockAssemblyResult2,
ExpectedResult = new ExpectedResult("Failed")
{
Total = 35, Passed = 21, Failed = 5, Warnings = 1, Inconclusive = 1, Skipped = 7,
Assemblies = new ExpectedAssemblyResult[] { new ExpectedAssemblyResult("mock-assembly.dll") }
}
},
new PackageTest(1, "Net70PackageTest")
{
Description = "Run mock-assembly.dll targeting .NET 7.0",
Arguments = "testdata/net7.0/mock-assembly.dll",
ExpectedResult = MockAssemblyResult2,
ExpectedResult = new ExpectedResult("Failed")
{
Total = 35, Passed = 21, Failed = 5, Warnings = 1, Inconclusive = 1, Skipped = 7,
Assemblies = new ExpectedAssemblyResult[] { new ExpectedAssemblyResult("mock-assembly.dll") }
}
},
new PackageTest(1, "Net80PackageTest")
{
Description = "Run mock-assembly.dll targeting .NET 8.0",
Arguments = "testdata/net8.0/mock-assembly.dll",
ExpectedResult = MockAssemblyResult2
ExpectedResult = new ExpectedResult("Failed")
{
Total = 35, Passed = 21, Failed = 5, Warnings = 1, Inconclusive = 1, Skipped = 7,
Assemblies = new ExpectedAssemblyResult[] { new ExpectedAssemblyResult("mock-assembly.dll") }
}
},
new PackageTest(1, "AspNetCore80Test")
{
Description = "Run test using AspNetCore targeting .NET 8.0",
Arguments = "testdata/net8.0/aspnetcore-test.dll",
ExpectedResult = AspNetCoreResult
ExpectedResult = new ExpectedResult("Passed")
{
Total = 2, Passed = 2, Failed = 0, Warnings = 0, Inconclusive = 0, Skipped = 0,
Assemblies = new ExpectedAssemblyResult[] { new ExpectedAssemblyResult("aspnetcore-test.dll") }
}
},
new PackageTest(1, "Net80WindowsFormsTest")
{
Description = "Run test using windows forms under .NET 8.0",
Arguments = "testdata/net8.0-windows/windows-test.dll",
ExpectedResult = WindowsFormsResult
ExpectedResult = new ExpectedResult("Passed")
{
Total = 2, Passed = 2, Failed = 0, Warnings = 0, Inconclusive = 0, Skipped = 0,
Assemblies = new ExpectedAssemblyResult[] { new ExpectedAssemblyResult("windows-test.dll") }
}
}
};

Expand Down
1 change: 0 additions & 1 deletion net80-pluggable-agent.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{34216BD6-51BE-44BE-9E0D-503ACB44B54C}"
ProjectSection(SolutionItems) = preProject
nuget\DotnetToolSettings.xml = nuget\DotnetToolSettings.xml
nuget\Net80PluggableAgent.nuspec = nuget\Net80PluggableAgent.nuspec
EndProjectSection
EndProject
Expand Down
28 changes: 0 additions & 28 deletions src/testdata/mock-assembly/AccessesCurrentTestContextDuringDiscovery.cs
View file
Open in desktop

This file was deleted.

Loading
Loading