Skip to content

Commit

Permalink
Update version to 8.2024.309.2334
Browse files Browse the repository at this point in the history
  • Loading branch information
ignatandrei committed Mar 9, 2024
1 parent 316d110 commit d603ec9
Show file tree
Hide file tree
Showing 39 changed files with 432 additions and 273 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# PackageAnalyzer

Analyzer for .NET solution / projects . Latest version 8.2024.309.1834
Analyzer for .NET solution / projects . Latest version 8.2024.309.2334


## Install as local tool
Expand Down
2 changes: 1 addition & 1 deletion src/NetPackageAnalyzer/.config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"netpackageanalyzerconsole": {
"version": "8.2024.309.1834",
"version": "8.2024.309.2334",
"commands": [
"PackageAnalyzer"
]
Expand Down
2 changes: 1 addition & 1 deletion src/NetPackageAnalyzer/Analysis/DisplayAllVersions.html
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@
}
}
</script>
<small>Generated by https://www.nuget.org/packages/netpackageanalyzerconsole , version 8.2024.309.1834</small>
<small>Generated by https://www.nuget.org/packages/netpackageanalyzerconsole , version 8.2024.309.2334</small>

</body>
</html>
2 changes: 1 addition & 1 deletion src/NetPackageAnalyzer/Analysis/DisplayAllVersions.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
| 13 | System.Threading.Tasks.Extensions | *4.5.4* NetPackageAnalyzerConsole,NetPackageAnalyzerWork|
| 14 | ThisAssembly.AssemblyInfo | *1.4.0* NetPackageAnalyzerConsole,NetPackageAnalyzerWork|

<small>Generated by https://www.nuget.org/packages/netpackageanalyzerconsole , version 8.2024.309.1834</small>
<small>Generated by https://www.nuget.org/packages/netpackageanalyzerconsole , version 8.2024.309.2334</small>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

# Number of packages that differ in major version : 0

<small>Generated by https://www.nuget.org/packages/netpackageanalyzerconsole , version 8.2024.309.1834</small>
<small>Generated by https://www.nuget.org/packages/netpackageanalyzerconsole , version 8.2024.309.2334</small>
2 changes: 1 addition & 1 deletion src/NetPackageAnalyzer/Analysis/ProjectRelation.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,5 +84,5 @@ NetPackageAnalyzerConsole-->NetPackageAnalyzerWork
```
<small>Generated by https://www.nuget.org/packages/netpackageanalyzerconsole , version 8.2024.309.1834</small>
<small>Generated by https://www.nuget.org/packages/netpackageanalyzerconsole , version 8.2024.309.2334</small>

Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@

[Back To Solution](../../ProjectRelation.md)

<small>Generated by https://www.nuget.org/packages/netpackageanalyzerconsole , version 8.2024.309.1834</small>
<small>Generated by https://www.nuget.org/packages/netpackageanalyzerconsole , version 8.2024.309.2334</small>

Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ AnalyzeMerge[AnalyzeMerge/AnalyzeMerge.csproj]

[Back To Solution](../../ProjectRelation.md)

<small>Generated by https://www.nuget.org/packages/netpackageanalyzerconsole , version 8.2024.309.1834</small>
<small>Generated by https://www.nuget.org/packages/netpackageanalyzerconsole , version 8.2024.309.2334</small>

Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@

[Back To Solution](../../ProjectRelation.md)

<small>Generated by https://www.nuget.org/packages/netpackageanalyzerconsole , version 8.2024.309.1834</small>
<small>Generated by https://www.nuget.org/packages/netpackageanalyzerconsole , version 8.2024.309.2334</small>

Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@ NetPackageAnalyzerConsole-->NetPackageAnalyzerWork

[Back To Solution](../../ProjectRelation.md)

<small>Generated by https://www.nuget.org/packages/netpackageanalyzerconsole , version 8.2024.309.1834</small>
<small>Generated by https://www.nuget.org/packages/netpackageanalyzerconsole , version 8.2024.309.2334</small>

Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@

[Back To Solution](../../ProjectRelation.md)

<small>Generated by https://www.nuget.org/packages/netpackageanalyzerconsole , version 8.2024.309.1834</small>
<small>Generated by https://www.nuget.org/packages/netpackageanalyzerconsole , version 8.2024.309.2334</small>

Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ NetPackageAnalyzerWork[NetPackageAnalyzerWork/NetPackageAnalyzerWork.csproj]

[Back To Solution](../../ProjectRelation.md)

<small>Generated by https://www.nuget.org/packages/netpackageanalyzerconsole , version 8.2024.309.1834</small>
<small>Generated by https://www.nuget.org/packages/netpackageanalyzerconsole , version 8.2024.309.2334</small>

Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<ProjectReference Include="..\NetPackageAnalyzerWork\NetPackageAnalyzerWork.csproj" />
</ItemGroup>
<PropertyGroup>
<Version>8.2024.309.1834</Version>
<Version>8.2024.309.2334</Version>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
<PackAsTool>true</PackAsTool>
<ToolCommandName>PackageAnalyzer</ToolCommandName>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,15 @@ public async Task GenerateNow(string folder,string where)


}
file = Path.Combine(folderResults, "BuildingBlocks.md");
await File.WriteAllTextAsync(file, await generator.Generate_BuildingBlocks(projectsDict));

file = Path.Combine(folderResults, "TestProjects.md");
await File.WriteAllTextAsync(file, await generator.Generate_TestProjects(projectsDict));

file = Path.Combine(folderResults, "RootProjects.md");
await File.WriteAllTextAsync(file, await generator.Generate_RootProjects(projectsDict));

//file = Path.Combine(folderResults, "DisplayAllVersionsWithProblems.md");
//ArgumentNullException.ThrowIfNull(projectsDict);
//await File.WriteAllTextAsync(file, await generator.Generate_DisplayAllVersionsWithProblemsMarkdown(model));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,22 @@
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Version>8.2024.309.1834</Version>
<Version>8.2024.309.2334</Version>
</PropertyGroup>

<ItemGroup>
<AdditionalFiles Include="generatedJson/deprecatedV1.gen.json" />
<AdditionalFiles Include="generatedJson/outdatedV1.gen.json" />
<AdditionalFiles Include="generatedJson/includeV1.gen.json" />
<AdditionalFiles Include="mixin/Packages.mixin" />
<AdditionalFiles Include="Templates\ProjectRoot.cshtml">
<IsRazorBlade>True</IsRazorBlade>
<Namespace>$([MSBuild]::ValueOrDefault('$(RootNamespace).%(RelativeDir)', '').Replace('\', '.').Replace('/', '.').Trim('.'))</Namespace>
</AdditionalFiles>
<AdditionalFiles Include="Templates\TestProjects.cshtml">
<IsRazorBlade>True</IsRazorBlade>
<Namespace>$([MSBuild]::ValueOrDefault('$(RootNamespace).%(RelativeDir)', '').Replace('\', '.').Replace('/', '.').Trim('.'))</Namespace>
</AdditionalFiles>
<AdditionalFiles Include="Templates\DisplayAllVersionsProblemsForMarkdown.cshtml">
<IsRazorBlade>True</IsRazorBlade>
<Namespace>$([MSBuild]::ValueOrDefault('$(RootNamespace).%(RelativeDir)', '').Replace('\', '.').Replace('/', '.').Trim('.'))</Namespace>
Expand All @@ -24,6 +32,10 @@
<IsRazorBlade>True</IsRazorBlade>
<Namespace>$([MSBuild]::ValueOrDefault('$(RootNamespace).%(RelativeDir)', '').Replace('\', '.').Replace('/', '.').Trim('.'))</Namespace>
</AdditionalFiles>
<AdditionalFiles Include="Templates\BuildingBlocks.cshtml">
<IsRazorBlade>True</IsRazorBlade>
<Namespace>$([MSBuild]::ValueOrDefault('$(RootNamespace).%(RelativeDir)', '').Replace('\', '.').Replace('/', '.').Trim('.'))</Namespace>
</AdditionalFiles>
<AdditionalFiles Include="Templates\SimpleDisplayProjectWithReferencesProject.cshtml">
<IsRazorBlade>True</IsRazorBlade>
<Namespace>$([MSBuild]::ValueOrDefault('$(RootNamespace).%(RelativeDir)', '').Replace('\', '.').Replace('/', '.').Trim('.'))</Namespace>
Expand Down Expand Up @@ -53,21 +65,27 @@
<Watch Include="**\*.cshtml" />
</ItemGroup>
<ItemGroup>
<None Remove="Templates\BuildingBlocks.cshtml" />
<None Remove="Templates\DisplayAllVersionsProblemsForMarkdown.cshtml" />
<None Remove="Templates\ProjectPackages.cshtml" />
<None Remove="Templates\ProjectRelations.cshtml" />
<None Remove="Templates\ProjectRoot.cshtml" />
<None Remove="Templates\ProjectsRelations.cshtml" />
<None Remove="Templates\SimpleDisplayProjectWithReferencesProject.cshtml" />
<None Remove="Templates\TestProjects.cshtml" />
</ItemGroup>
<ItemGroup>
<RazorBlade Remove="Templates\DisplayAllVersionsProblemsForMarkdown.cshtml" />
</ItemGroup>
<ItemGroup>
<Watch Remove="Templates\BuildingBlocks.cshtml" />
<Watch Remove="Templates\DisplayAllVersionsProblemsForMarkdown.cshtml" />
<Watch Remove="Templates\ProjectPackages.cshtml" />
<Watch Remove="Templates\ProjectRelations.cshtml" />
<Watch Remove="Templates\ProjectRoot.cshtml" />
<Watch Remove="Templates\ProjectsRelations.cshtml" />
<Watch Remove="Templates\SimpleDisplayProjectWithReferencesProject.cshtml" />
<Watch Remove="Templates\TestProjects.cshtml" />
</ItemGroup>


Expand Down
12 changes: 12 additions & 0 deletions src/NetPackageAnalyzer/NetPackageAnalyzerWork/PackageData.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
namespace NetPackageAnalyzerConsole;
public record PackageData(string packageVersionId)
{
public bool IsTest()
{
if (packageVersionId.ToLowerInvariant().StartsWith("microsoft.test"))
return true;

if (packageVersionId.ToLowerInvariant().StartsWith("nunit"))
return true;
if (packageVersionId.ToLowerInvariant().StartsWith("xunit"))
return true;

return false;
}
public Dictionary<string, HashSet<ProjectData>> VersionsPerProject { get; set; } = new();
public TypePackageData typePackageData()
{
Expand Down
5 changes: 4 additions & 1 deletion src/NetPackageAnalyzer/NetPackageAnalyzerWork/ProjectData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ public PackageData[] AlphabeticalProjectPackages
}
}


public bool IsTestProject()
{
return Packages.Any(it => it.IsTest());
}
public string NameCSproj()
{
var indexDot=PathProject.LastIndexOf(".");
Expand Down
40 changes: 35 additions & 5 deletions src/NetPackageAnalyzer/NetPackageAnalyzerWork/ProjectsDict.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,30 @@ public long MaxReferences
return this.Values.Select(it => it.ProjectsReferences.Count).Max();
}
}
public ProjectData[] BuildingBlocks()
public ProjectData[] TestsProjects
{
var ret = this.Values
.Where(it=>it.ProjectsReferences.Count==0)
get
{
return this.Values
.Where(it => it.Packages.Any(it=>it.IsTest()))
.ToArray();
;
}
}
public ProjectData[] ProjectsNoTest
{
get
{
var tests = this.TestsProjects;
return this.Values
.Where(it => !tests.Contains(it))
.ToArray();
}
}
public ProjectData[] BuildingBlocks(int nrReferences)
{
var ret = this.ProjectsNoTest
.Where(it=>it.ProjectsReferences.Count==nrReferences)
.OrderBy(it => it.NameCSproj())
.ToArray();
return ret;
Expand All @@ -41,12 +61,12 @@ public ProjectData[] RootProjects
.ToArray();
if (allRefs.Length == 0)
{
return this.Values
return this.ProjectsNoTest
.OrderBy(it => it.NameCSproj()).ToArray();
}

var data =
this.Values
this.ProjectsNoTest
.Select(it => it)
.ToArray();

Expand All @@ -60,6 +80,16 @@ public ProjectData[] RootProjects
return q;
}
}
public ProjectData[] AlphabeticOrderedProjectsNoTests
{
get
{
return this.Values
.Where(it=>it.IsTestProject()==false)
.OrderBy(it => it.NameCSproj())
.ToArray();
}
}
public ProjectData[] AlphabeticOrderedProjects
{
get
Expand Down
15 changes: 15 additions & 0 deletions src/NetPackageAnalyzer/NetPackageAnalyzerWork/TemplateGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,21 @@ public async Task<string> Generate_ProjectsRelations(ProjectsDict model)
var rz= new ProjectPackages(model);
return await rz.RenderAsync();
}
internal async Task<string?> Generate_BuildingBlocks(ProjectsDict model)
{
var rz = new BuildingBlocks(model);
return await rz.RenderAsync();
}
internal async Task<string?> Generate_RootProjects(ProjectsDict model)
{
var rz = new ProjectRoot(model);
return await rz.RenderAsync();
}
internal async Task<string?> Generate_TestProjects(ProjectsDict model)
{
var rz = new TestProjects(model);
return await rz.RenderAsync();
}

internal async Task<string?> Generate_ProjectRelations(ProjectData projData)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
@inherits RazorBlade.PlainTextTemplate<ProjectsDict>;
@{
var prefix = GlobalsForGenerating.globalPrefix();
var nrMaxProjects = Math.Max(Model.MaxReferences/3,3);
}
# Projects Building Blocks

@for (int i = 0; i < nrMaxProjects; i++)
{
<text>## Building Blocks - Projects with @i project references

@foreach(var bbProj in Model.BuildingBlocks(i))
{
var nameCsproj = bbProj.NameCSproj();
var relativePath = bbProj.RelativePath();
<text>


### @nameCsproj

Full Name : @relativePath

[@nameCsproj Relations ](@prefix/Projects/@nameCsproj/ProjectReferences)

[@nameCsproj Packages](@prefix/Projects/@nameCsproj/Packages)

</text>
}
</text>

}
<small>Generated by https://www.nuget.org/packages/netpackageanalyzerconsole , version @Model.Version</small>
Loading

0 comments on commit d603ec9

Please sign in to comment.