Skip to content

Commit 9ff34b4

Browse files
zHaytamzHaytam
authored
Merge pull request #418 from Blazor-Diagrams/develop
Version 3.0.2
2 parents 46d9800 + 88b0225 commit 9ff34b4

File tree

27 files changed

+1982
-171
lines changed

27 files changed

+1982
-171
lines changed

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
name: Build
1313
runs-on: ubuntu-latest
1414
steps:
15-
- name: Set up JDK 11
15+
- name: Set up JDK 17
1616
uses: actions/setup-java@v1
1717
with:
18-
java-version: 1.11
18+
java-version: 17
1919
- uses: actions/checkout@v2
2020
with:
2121
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis

‎Blazor.Diagrams.sln‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@ Microsoft Visual Studio Solution File, Format Version 12.00
44
VisualStudioVersion = 17.0.32014.148
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EE32E278-A887-454E-987D-FFE9E37169FE}"
7+
ProjectSection(SolutionItems) = preProject
8+
src\Directory.Build.props = src\Directory.Build.props
9+
EndProjectSection
710
EndProject
811
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blazor.Diagrams.Core", "src\Blazor.Diagrams.Core\Blazor.Diagrams.Core.csproj", "{1A70B637-9EF8-4C25-970E-A681DEC9061C}"
912
EndProject
1013
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{DA819127-3EF6-4EB9-A2DA-BC056B284A50}"
14+
ProjectSection(SolutionItems) = preProject
15+
samples\Directory.Build.props = samples\Directory.Build.props
16+
EndProjectSection
1117
EndProject
1218
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wasm", "samples\Wasm\Wasm.csproj", "{A43942BD-FDA0-4E3D-8115-BBE9D0D75DE3}"
1319
EndProject
@@ -23,16 +29,23 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
2329
ProjectSection(SolutionItems) = preProject
2430
.github\workflows\build.yml = .github\workflows\build.yml
2531
CHANGELOG.md = CHANGELOG.md
32+
Directory.Packages.props = Directory.Packages.props
2633
.github\workflows\main.yml = .github\workflows\main.yml
2734
.github\workflows\push.yml = .github\workflows\push.yml
2835
README.md = README.md
2936
EndProjectSection
3037
EndProject
3138
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CEEAE4C2-CE68-4FC3-9E0F-D4781B91F7F4}"
39+
ProjectSection(SolutionItems) = preProject
40+
tests\Directory.Build.props = tests\Directory.Build.props
41+
EndProjectSection
3242
EndProject
3343
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blazor.Diagrams.Core.Tests", "tests\Blazor.Diagrams.Core.Tests\Blazor.Diagrams.Core.Tests.csproj", "{36B4DCCD-45AB-4338-9224-DDAF386A23A3}"
3444
EndProject
3545
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{A9FC9B20-A9F1-4066-8B59-83BD26D3B1C8}"
46+
ProjectSection(SolutionItems) = preProject
47+
docs\Directory.Build.props = docs\Directory.Build.props
48+
EndProjectSection
3649
EndProject
3750
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Diagram-Demo", "docs\Diagram-Demo\Diagram-Demo.csproj", "{5F423724-5319-4DCE-B9F2-8B2D7E1FDC17}"
3851
EndProject

‎CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## Diagram (3.0.0) - 2024-02-24
9+
10+
### Added
11+
12+
- Support for .NET 8 (thanks to @[SebastianWachsmuth](https://github.com/SebastianWachsmuth))
13+
14+
### Fixed
15+
16+
- Link labels not showing in Firefox
17+
- NRE in the DemoSite's Options page (thanks to @[robertmclaws](https://github.com/robertmclaws))
18+
819
## Diagrams (3.0.1) - 2023-10-27
920

1021
### Added

‎Directory.Packages.props‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<Project>
2+
3+
<ItemGroup>
4+
<PackageVersion Include="SvgPathProperties" Version="1.1.2" />
5+
<PackageVersion Include="System.Net.Http.Json" Version="8.0.0" />
6+
<PackageVersion Include="GraphShape" Version="1.2.1" />
7+
<PackageVersion Include="MatBlazor" Version="2.10.0" />
8+
<PackageVersion Include="bunit" Version="1.25.3" />
9+
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
10+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
11+
<PackageVersion Include="xunit" Version="2.6.3" />
12+
<PackageVersion Include="Moq" Version="[4.18.4]" />
13+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.5"/>
14+
<PackageVersion Include="coverlet.collector" Version="6.0.0"/>
15+
</ItemGroup>
16+
17+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
18+
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="6.0.25" />
19+
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="6.0.25" />
20+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.25" />
21+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.25" />
22+
</ItemGroup>
23+
24+
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
25+
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="7.0.14" />
26+
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="7.0.14" />
27+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.14" />
28+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.14" />
29+
</ItemGroup>
30+
31+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
32+
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="[8, 9.0.0)" />
33+
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="[8, 9.0.0)" />
34+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="[8,9.0.0)" />
35+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="[8,9.0.0)" />
36+
</ItemGroup>
37+
</Project>

‎README.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Z.Blazor.Diagrams is a fully customizable and extensible all-purpose diagrams li
3030
- Multi purpose
3131
- Touch support
3232
- SVG layer for links/nodes and HTML layer for nodes for maximum customizability
33-
- Links between nodes directly or node ports
33+
- Links between nodes, ports and even other links
3434
- Link routers, path generators, markers and labels
3535
- Panning, Zooming and Zooming to fit a set of nodes
3636
- Multi selection, deletion and region selection
@@ -48,9 +48,7 @@ Z.Blazor.Diagrams is a fully customizable and extensible all-purpose diagrams li
4848
You can get started very easily & quickly using:
4949

5050
- [Documentation](https://blazor-diagrams.zhaytam.com/)
51-
- [Quick Start](https://blazor-diagrams.zhaytam.com/quickstart)
52-
- [Samples](https://blazor-diagrams.zhaytam.com/demos/simple)
53-
- [Docs/Demos](https://github.com/Blazor-Diagrams/Blazor.Diagrams/tree/master/docs)
51+
- [Installation](https://blazor-diagrams.zhaytam.com/documentation/installation)
5452

5553
### Sample project
5654

‎docs/CustomNodesLinks/CustomNodesLinks.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

3-
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
5-
</PropertyGroup>
6-
73
<ItemGroup>
84
<ProjectReference Include="..\..\src\Blazor.Diagrams.Core\Blazor.Diagrams.Core.csproj" />
95
<ProjectReference Include="..\..\src\Blazor.Diagrams\Blazor.Diagrams.csproj" />

‎docs/Diagram-Demo/Diagram-Demo.csproj‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

3-
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
5-
<RootNamespace>Diagram_Demo</RootNamespace>
6-
</PropertyGroup>
7-
83
<ItemGroup>
94
<ProjectReference Include="..\..\src\Blazor.Diagrams.Core\Blazor.Diagrams.Core.csproj" />
105
<ProjectReference Include="..\..\src\Blazor.Diagrams\Blazor.Diagrams.csproj" />

‎docs/Directory.Build.props‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Project>
2+
<PropertyGroup>
3+
<TargetFramework>net8.0</TargetFramework>
4+
<Nullable>enable</Nullable>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
7+
</PropertyGroup>
8+
</Project>

‎docs/Layouts/Layouts.csproj‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

3-
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
5-
</PropertyGroup>
6-
73
<ItemGroup>
8-
<PackageReference Include="GraphShape" Version="1.2.0" />
9-
<PackageReference Include="MatBlazor" Version="2.9.0-develop-042" />
4+
<PackageReference Include="GraphShape" />
5+
<PackageReference Include="MatBlazor" />
106
</ItemGroup>
117

128
<ItemGroup>

‎samples/Directory.Build.props‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Project>
2+
<PropertyGroup>
3+
<TargetFramework>net8.0</TargetFramework>
4+
<Nullable>enable</Nullable>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
7+
</PropertyGroup>
8+
</Project>

0 commit comments

Comments
 (0)