Skip to content

Simplify dotTrace diagnoser, dedupe common code #2558

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

Closed
martinothamar wants to merge 4 commits into from
Closed

Simplify dotTrace diagnoser, dedupe common code #2558

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a6e010
Simplify dotTrace diagnoser by only using JB.SelfApi, dedupe som code…
martinothamar Apr 12, 2024
635321a
Ditch shared classlib, just use a folder
martinothamar Apr 13, 2024
e26d1ba
simplify shared namespace
martinothamar Apr 14, 2024
943a8b2
recursive wildcard include
martinothamar Apr 14, 2024
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
Next Next commit
Simplify dotTrace diagnoser by only using JB.SelfApi, dedupe som code… 
… by including from shared project
  • Loading branch information
@martinothamar
martinothamar committed Apr 12, 2024
commit 3a6e01070164d067de6f13bdd887083ea5b58e28
36 changes: 23 additions & 13 deletions BenchmarkDotNet.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BenchmarkDotNet.Templates", "templates\BenchmarkDotNet.Templates.csproj", "{B620D10A-CD8E-4A34-8B27-FD6257E63AD0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BenchmarkDotNet.Diagnostics.dotTrace", "src\BenchmarkDotNet.Diagnostics.dotTrace\BenchmarkDotNet.Diagnostics.dotTrace.csproj", "{C5BDA61F-3A56-4B59-901D-0A17E78F4076}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks", "tests\BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks\BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks.csproj", "{AACA2C63-A85B-47AB-99FC-72C3FF408B14}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BenchmarkDotNet.TestAdapter", "src\BenchmarkDotNet.TestAdapter\BenchmarkDotNet.TestAdapter.csproj", "{4C9C89B8-7C4E-4ECF-B3C9-324C8772EDAC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BenchmarkDotNet.Diagnostics.dotMemory", "src\BenchmarkDotNet.Diagnostics.dotMemory\BenchmarkDotNet.Diagnostics.dotMemory.csproj", "{2E2283A3-6DA6-4482-8518-99D6D9F689AB}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JetBrains", "JetBrains", "{AD5887B3-2F6C-48B6-B338-A4E286AFFBBD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BenchmarkDotNet.Diagnostics.dotMemory", "src\JetBrains\BenchmarkDotNet.Diagnostics.dotMemory\BenchmarkDotNet.Diagnostics.dotMemory.csproj", "{777D5767-4B68-4E83-A445-D1ABAE272718}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BenchmarkDotNet.Diagnostics.dotTrace", "src\JetBrains\BenchmarkDotNet.Diagnostics.dotTrace\BenchmarkDotNet.Diagnostics.dotTrace.csproj", "{EA2E4258-E639-4C14-9147-B4B062769DFE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BenchmarkDotNet.JetBrains.Shared", "src\JetBrains\BenchmarkDotNet.JetBrains.Shared\BenchmarkDotNet.JetBrains.Shared.csproj", "{207F4A9A-6778-40E9-9F60-EAD75DF6B90E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -133,10 +137,6 @@ Global
{B620D10A-CD8E-4A34-8B27-FD6257E63AD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B620D10A-CD8E-4A34-8B27-FD6257E63AD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B620D10A-CD8E-4A34-8B27-FD6257E63AD0}.Release|Any CPU.Build.0 = Release|Any CPU
{C5BDA61F-3A56-4B59-901D-0A17E78F4076}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C5BDA61F-3A56-4B59-901D-0A17E78F4076}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C5BDA61F-3A56-4B59-901D-0A17E78F4076}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C5BDA61F-3A56-4B59-901D-0A17E78F4076}.Release|Any CPU.Build.0 = Release|Any CPU
{AACA2C63-A85B-47AB-99FC-72C3FF408B14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AACA2C63-A85B-47AB-99FC-72C3FF408B14}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AACA2C63-A85B-47AB-99FC-72C3FF408B14}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -145,10 +145,18 @@ Global
{4C9C89B8-7C4E-4ECF-B3C9-324C8772EDAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4C9C89B8-7C4E-4ECF-B3C9-324C8772EDAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4C9C89B8-7C4E-4ECF-B3C9-324C8772EDAC}.Release|Any CPU.Build.0 = Release|Any CPU
{2E2283A3-6DA6-4482-8518-99D6D9F689AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2E2283A3-6DA6-4482-8518-99D6D9F689AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2E2283A3-6DA6-4482-8518-99D6D9F689AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2E2283A3-6DA6-4482-8518-99D6D9F689AB}.Release|Any CPU.Build.0 = Release|Any CPU
{777D5767-4B68-4E83-A445-D1ABAE272718}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{777D5767-4B68-4E83-A445-D1ABAE272718}.Debug|Any CPU.Build.0 = Debug|Any CPU
{777D5767-4B68-4E83-A445-D1ABAE272718}.Release|Any CPU.ActiveCfg = Release|Any CPU
{777D5767-4B68-4E83-A445-D1ABAE272718}.Release|Any CPU.Build.0 = Release|Any CPU
{EA2E4258-E639-4C14-9147-B4B062769DFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EA2E4258-E639-4C14-9147-B4B062769DFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EA2E4258-E639-4C14-9147-B4B062769DFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EA2E4258-E639-4C14-9147-B4B062769DFE}.Release|Any CPU.Build.0 = Release|Any CPU
{207F4A9A-6778-40E9-9F60-EAD75DF6B90E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{207F4A9A-6778-40E9-9F60-EAD75DF6B90E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{207F4A9A-6778-40E9-9F60-EAD75DF6B90E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{207F4A9A-6778-40E9-9F60-EAD75DF6B90E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -172,10 +180,12 @@ Global
{B4405781-40D3-42B8-B168-00E711FABA15} = {14195214-591A-45B7-851A-19D3BA2413F9}
{D9F5065B-6190-431B-850C-117E3D64AB33} = {D6597E3A-6892-4A68-8E14-042FC941FDA2}
{B620D10A-CD8E-4A34-8B27-FD6257E63AD0} = {63B94FD6-3F3D-4E04-9727-48E86AC4384C}
{C5BDA61F-3A56-4B59-901D-0A17E78F4076} = {D6597E3A-6892-4A68-8E14-042FC941FDA2}
{AACA2C63-A85B-47AB-99FC-72C3FF408B14} = {14195214-591A-45B7-851A-19D3BA2413F9}
{4C9C89B8-7C4E-4ECF-B3C9-324C8772EDAC} = {D6597E3A-6892-4A68-8E14-042FC941FDA2}
{2E2283A3-6DA6-4482-8518-99D6D9F689AB} = {D6597E3A-6892-4A68-8E14-042FC941FDA2}
{AD5887B3-2F6C-48B6-B338-A4E286AFFBBD} = {D6597E3A-6892-4A68-8E14-042FC941FDA2}
{777D5767-4B68-4E83-A445-D1ABAE272718} = {AD5887B3-2F6C-48B6-B338-A4E286AFFBBD}
{EA2E4258-E639-4C14-9147-B4B062769DFE} = {AD5887B3-2F6C-48B6-B338-A4E286AFFBBD}
{207F4A9A-6778-40E9-9F60-EAD75DF6B90E} = {AD5887B3-2F6C-48B6-B338-A4E286AFFBBD}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {4D9AF12B-1F7F-45A7-9E8C-E4E46ADCBD1F}
Expand Down
9 changes: 8 additions & 1 deletion build/BenchmarkDotNet.Build/BuildContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public BuildContext(ICakeContext context)
TemplatesTestsProjectFile = RootDirectory.Combine("templates")
.CombineWithFilePath("BenchmarkDotNet.Templates.csproj");
AllPackableSrcProjects = new FilePathCollection(context.GetFiles(RootDirectory.FullPath + "/src/**/*.csproj")
.Where(p => !p.FullPath.Contains("Disassembler")));
.Where(p => !p.FullPath.Contains("Disassembler") && !p.FullPath.Contains("Shared")));

VersionsFile = BuildDirectory.CombineWithFilePath("versions.txt");
CommonPropsFile = BuildDirectory.CombineWithFilePath("common.props");
Expand Down Expand Up @@ -137,6 +137,13 @@ public BuildContext(ICakeContext context)
.GetSubDirectories(RootDirectory.Combine("src"))
.Select(directoryPath => directoryPath.GetDirectoryName())
.Where(name => !name.Contains("Disassembler", StringComparison.OrdinalIgnoreCase)));

var jetBrainsNugetPackages = this
.GetSubDirectories(RootDirectory.Combine("src/JetBrains"))
.Select(directoryPath => directoryPath.GetDirectoryName())
.Where(name => !name.Contains("Shared", StringComparison.OrdinalIgnoreCase));
nuGetPackageNames.AddRange(jetBrainsNugetPackages);

nuGetPackageNames.Add("BenchmarkDotNet.Templates");
nuGetPackageNames.Sort();
NuGetPackageNames = nuGetPackageNames;
Expand Down
4 changes: 2 additions & 2 deletions samples/BenchmarkDotNet.Samples/BenchmarkDotNet.Samples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\BenchmarkDotNet.Diagnostics.dotTrace\BenchmarkDotNet.Diagnostics.dotTrace.csproj" />
<ProjectReference Include="..\..\src\BenchmarkDotNet.Diagnostics.dotMemory\BenchmarkDotNet.Diagnostics.dotMemory.csproj" />
<ProjectReference Include="..\..\src\JetBrains\BenchmarkDotNet.Diagnostics.dotTrace\BenchmarkDotNet.Diagnostics.dotTrace.csproj" />
<ProjectReference Include="..\..\src\JetBrains\BenchmarkDotNet.Diagnostics.dotMemory\BenchmarkDotNet.Diagnostics.dotMemory.csproj" />
<ProjectReference Include="..\..\src\BenchmarkDotNet\BenchmarkDotNet.csproj" />
<ProjectReference Include="..\..\src\BenchmarkDotNet.Diagnostics.Windows\BenchmarkDotNet.Diagnostics.Windows.csproj" />
<ProjectReference Include="..\..\src\BenchmarkDotNet.TestAdapter\BenchmarkDotNet.TestAdapter.csproj" />
Expand Down
38 changes: 0 additions & 38 deletions src/BenchmarkDotNet.Diagnostics.dotMemory/Progress.cs
View file
Open in desktop

This file was deleted.

145 changes: 0 additions & 145 deletions src/BenchmarkDotNet.Diagnostics.dotTrace/DotTraceToolBase.cs
View file
Open in desktop

This file was deleted.

84 changes: 0 additions & 84 deletions src/BenchmarkDotNet.Diagnostics.dotTrace/ExternalDotTraceTool.cs
View file
Open in desktop

This file was deleted.

Loading