Skip to content
This repository was archived by the owner on Mar 22, 2023. It is now read-only.

C4PlantUmlWriter: Update with v2.2.0 tags and styles (and with EnableNextFeatures the v2.3.0 features) #6

Open
kirchsth wants to merge 7 commits into
base: master
Choose a base branch
from
Open

C4PlantUmlWriter: Update with v2.2.0 tags and styles (and with EnableNextFeatures the v2.3.0 features) #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
71de51b
- Update nuget references to Structurizr.* 1.0.0
kirchsth Jun 22, 2021
b07a840
Structurizr.Reflection - remove obsolete System.Runtime reference
kirchsth Jun 22, 2021
b0c4b00
C4PlantUml: throw exception if Element cannot be found
kirchsth Jun 23, 2021
ab21d06
C4PlantUmlWriter: update generated source to new C4PlantUml stdlib v…
kirchsth Jun 23, 2021
86836c6
C4PlantUmlWriter: update generated source to new C4PlantUml stdlib v…
kirchsth Jun 23, 2021
cc7e5aa
BigBankPlc example updated from Structurizr.dotnet
kirchsth Jun 23, 2021
adebc25
C4PlantUmlWriter: Update with v2.2.0 tags and styles (and with Enable…
kirchsth Jun 28, 2021
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
4 changes: 2 additions & 2 deletions Structurizr.ActiveDirectory/Structurizr.ActiveDirectory.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp1.1</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="3.16.1" />
<PackageReference Include="Structurizr.Client" Version="0.9.6" />
<PackageReference Include="Structurizr.Client" Version="1.0.0" />
</ItemGroup>

</Project>
6 changes: 4 additions & 2 deletions Structurizr.AdrTools.Tests/AdrTools/AdrToolsImporterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ public void Test_ImportArchitectureDecisionRecords_RewritesLinksBetweenADRsWhenT
importer.ImportArchitectureDecisionRecords();

Decision decision5 = _documentation.Decisions.Where(d => d.Id == "5").First();
Assert.True(decision5.Content.Contains("Amended by [9. Help scripts](#/:9)"));
// sync with java impl %2F instead of /
Assert.True(decision5.Content.Contains("Amended by [9. Help scripts](#%2F:9)"));
}

[Fact]
Expand All @@ -127,7 +128,8 @@ public void Test_ImportArchitectureDecisionRecords_SupportsTheIncorrectSpellingO

Decision decision4 = _documentation.Decisions.Where(d => d.Id == "4").First();
Assert.Equal(DecisionStatus.Superseded, decision4.Status);
Assert.True(decision4.Content.Contains("Superceded by [10. AsciiDoc format](#/:10)"));
// sync with java impl %2F instead of /
Assert.True(decision4.Content.Contains("Superceded by [10. AsciiDoc format](#%2F:10)"));
}

}
Expand Down
2 changes: 1 addition & 1 deletion Structurizr.AdrTools.Tests/Structurizr.AdrTools.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp1.1</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
Expand Down
8 changes: 6 additions & 2 deletions Structurizr.AdrTools/AdrTools/AdrToolsImporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,15 @@ public ISet<Decision> ImportArchitectureDecisionRecords(SoftwareSystem softwareS
private string CalculateUrl(SoftwareSystem softwareSystem, string id)
{
if (softwareSystem == null) {
return "#/:" + UrlEncode(id);
// sync with java impl
return "#" + UrlEncode("/") + ":" + UrlEncode(id);
}
else
{
return "#" + UrlEncode(softwareSystem.CanonicalName) + ":" + UrlEncode(id);
//CanonicalName impl changed: old "/", new "SoftwareSystem://" (CanonicalNameGenerator.SoftwareSystemType)
var name = softwareSystem.CanonicalName;
name = name.Substring("SoftwareSystem:/".Length); // last "/" is reused
return "#" + UrlEncode(name) + ":" + UrlEncode(id);
}
}

Expand Down
4 changes: 2 additions & 2 deletions Structurizr.AdrTools/Structurizr.AdrTools.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Structurizr.Core" Version="0.9.6" />
<PackageReference Include="Structurizr.Core" Version="1.0.0" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions Structurizr.Analysis/Structurizr.Analysis.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Structurizr.Core" Version="0.9.6" />
<PackageReference Include="Structurizr.Core" Version="1.0.0" />
</ItemGroup>

</Project>
12 changes: 12 additions & 0 deletions Structurizr.Annotations/Structurizr.Annotations.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@
</PropertyGroup>

<PropertyGroup>
<!--
<TargetFrameworks>netstandard1.0;net20;portable40-net40+sl4+win8+wp7;portable40-net40+sl5+win8+wp8+wpa81</TargetFrameworks>

<TargetFrameworks>netstandard1.0;netstandard2.0;net20;portable40-net40+sl4+win8+wp7;portable40-net40+sl5+win8+wp8+wpa81</TargetFrameworks>
-->
<TargetFrameworks>netstandard2.0;net20</TargetFrameworks>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Structurizr.Annotations.xml</DocumentationFile>
<NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
</PropertyGroup>
Expand Down Expand Up @@ -48,4 +53,11 @@
<Version>4.1.0</Version>
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Runtime">
<Version>4.1.0</Version>
</PackageReference>
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion Structurizr.Cecil.Examples/Structurizr.Cecil.Examples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="Mono.Cecil" Version="0.10.0" />
<PackageReference Include="Structurizr.Client" Version="0.9.3" />
<PackageReference Include="Structurizr.Client" Version="1.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Structurizr.Cecil/Structurizr.Cecil.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Mono.Cecil" Version="0.10.0" />
<PackageReference Include="Structurizr.Core" Version="0.9.6" />
<PackageReference Include="Structurizr.Core" Version="1.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading