Skip to content

fixed replace include path root #120

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed replace include path root #120

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
7 changes: 4 additions & 3 deletions src/PlantUmlClassDiagramGenerator/Generator/PlantUmlFromDirGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
Expand Down Expand Up @@ -106,8 +106,9 @@ public bool GeneratePlantUml(Dictionary<string, string> parameters)
}
else
{
var newRoot = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? @".\" : @".";
includeRefs.AppendLine("!include " + outputFile.Replace(outputRoot, newRoot));
//var newRoot = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? @".\" : @".";
var root = outputRoot.EndsWith(Path.DirectorySeparatorChar) ? outputRoot.TrimEnd(Path.DirectorySeparatorChar) : outputRoot;
includeRefs.AppendLine("!include " + outputFile.Replace(root, "."));
}
}
catch (Exception e)
Expand Down
4 changes: 4 additions & 0 deletions test/PlantUmlClassDiagramGeneratorTest/PlantUmlClassDiagramGeneratorTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,13 @@

<ItemGroup>
<Compile Remove="uml\20250517_151031\**" />
<Compile Remove="uml\20250517_165357\**" />
<Content Remove="uml\20250517_151031\**" />
<Content Remove="uml\20250517_165357\**" />
<EmbeddedResource Remove="uml\20250517_151031\**" />
<EmbeddedResource Remove="uml\20250517_165357\**" />
<None Remove="uml\20250517_151031\**" />
<None Remove="uml\20250517_165357\**" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions test/PlantUmlClassDiagramGeneratorTest/UnitTests/PlantUmlFromDirGeneratorTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ public void Generate(int testNum, bool allInOne, bool createAssociation, bool ad

public void Dispose()
{
if (Directory.Exists(outputDir))
{
Directory.Delete(outputDir, true);
}
//if (Directory.Exists(outputDir))
//{
// Directory.Delete(outputDir, true);
//}
}


Expand Down
6 changes: 3 additions & 3 deletions test/PlantUmlClassDiagramGeneratorTest/uml/Planets/case_1/include.puml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@startuml
!include .\\Earth.puml
!include .\\Moon.puml
!include .\\BaseTypes\PlanetBase.puml
!include .\Earth.puml
!include .\Moon.puml
!include .\BaseTypes\PlanetBase.puml
@enduml
6 changes: 3 additions & 3 deletions test/PlantUmlClassDiagramGeneratorTest/uml/Planets/case_2/include.puml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@startuml
!include .\\Earth.puml
!include .\\Moon.puml
!include .\\BaseTypes\PlanetBase.puml
!include .\Earth.puml
!include .\Moon.puml
!include .\BaseTypes\PlanetBase.puml
@enduml
6 changes: 3 additions & 3 deletions test/PlantUmlClassDiagramGeneratorTest/uml/Planets/case_3/include.puml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@startuml
!include .\\Earth.puml
!include .\\Moon.puml
!include .\\BaseTypes\PlanetBase.puml
!include .\Earth.puml
!include .\Moon.puml
!include .\BaseTypes\PlanetBase.puml
PlanetBase <|-- Earth
@enduml
6 changes: 3 additions & 3 deletions test/PlantUmlClassDiagramGeneratorTest/uml/Planets/case_4/include.puml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@startuml
!include .\\Earth.puml
!include .\\Moon.puml
!include .\\BaseTypes\PlanetBase.puml
!include .\Earth.puml
!include .\Moon.puml
!include .\BaseTypes\PlanetBase.puml
PlanetBase <|-- Earth
PlanetBase o-> "Moons<Moon>" "IList`1"
@enduml
Loading