New linux dotnet nuget push

.github/workflows/build.yml

@@ -1,47 +1,43 @@
-name: Build
+name: Build and Test
 on:
   push:
-    branches:
-      - master
-      - develop
-      - 3.0.0
+    branches: [ master ]
   pull_request:
-    types: [opened, synchronize, reopened]
+    branches: [ master ]
+
 jobs:
   build:
-    name: Build
+    name: Build - ${{ matrix.configuration }}
+
+    strategy:
+      matrix:
+        configuration: [ Debug, Release ]
+
     runs-on: ubuntu-latest
     steps:
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.11
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Cache SonarCloud packages
-        uses: actions/cache@v1
-        with:
-          path: ~\sonar\cache
-          key: ${{ runner.os }}-sonar
-          restore-keys: ${{ runner.os }}-sonar
-      - name: Cache SonarCloud scanner
-        id: cache-sonar-scanner
-        uses: actions/cache@v1
-        with:
-          path: .\.sonar\scanner
-          key: ${{ runner.os }}-sonar-scanner
-          restore-keys: ${{ runner.os }}-sonar-scanner
-      - name: Install SonarCloud scanner
-        if: steps.cache-sonar-scanner.outputs.cache-hit != 'true'
-        run: |
-          dotnet tool install --global dotnet-sonarscanner
-      - name: Build and analyze
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: |
-          dotnet-sonarscanner begin /k:"Blazor-Diagrams_Blazor.Diagrams" /o:"blazor-diagrams" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths="**\TestResults\*\*.xml" /d:sonar.exclusions="**/wwwroot/**"
-          dotnet build
-          dotnet test --no-build --collect:"XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover
-          dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
+    - uses: actions/checkout@v3
+
+    - name: Setup dotnet
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: |
+            8.0.x
+            6.0.x
+
+    - name: Install dependencies
+      run: dotnet restore
+
+    - name: Build
+      run: dotnet build --configuration ${{ matrix.configuration }}
+
+    - name: Test
+      if: matrix.configuration == 'Debug'
+      run: dotnet test --no-build
+
+    - name: Upload packages
+      if: matrix.configuration == 'Release'
+      uses: actions/upload-artifact@v4
+      with:
+        name: package
+        path: /home/runner/work/Blazor.Diagrams/Blazor.Diagrams/src/Blazor.Diagrams/bin/Release/*.nupkg
+        retention-days: 5

.github/workflows/release.yml

@@ -0,0 +1,67 @@
+name: Create release
+
+# On push to master branch. i.e. when we merge a PR.
+on:
+  push:
+    branches: [ master ]
+  workflow_dispatch:
+
+env:
+  PACKAGE_PATH: /home/runner/work/Blazor.Diagrams/Blazor.Diagrams/src/Blazor.Diagrams/bin/Release/*.nupkg
+
+jobs:
+  release:
+    name: Build - Release
+
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Setup dotnet
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: |
+            8.0.x
+            6.0.x
+
+      # Finds the latest release and increases the version
+    - name: Get next version
+      uses: reecetech/[email protected]
+      id: version
+      with:
+        scheme: semver
+        increment: patch
+
+    - name: Install version tool
+      run: dotnet tool install dotnetCampus.TagToVersion -g --version 1.0.11
+
+      # Writes the new version number to build/Version.props
+    - name: Set version
+      run: dotnet TagToVersion -t ${{ steps.version.outputs.version }}
+
+    - name: Install dependencies
+      run: dotnet restore
+
+      # Pacakge is created on build
+    - name: Build
+      run: dotnet build --configuration Release
+
+      # Upload package as an atrifact to the GitHub action
+    - name: Upload packages
+      uses: actions/upload-artifact@v4
+      with:
+        name: package
+        path: ${{ env.PACKAGE_PATH }}
+        retention-days: 5
+
+      # Create a new release and upload the package to the release
+    - name: Release
+      uses: softprops/action-gh-release@v1
+      with:
+        files: ${{ env.PACKAGE_PATH }}
+        tag_name: ${{ steps.version.outputs.version }}
+
+    - name: Push NuGet Package to NuGet Gallery
+      run: dotnet nuget push ${{ env.PACKAGE_PATH }} --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json

Blazor.Diagrams.sln

@@ -4,10 +4,16 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 17.0.32014.148
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EE32E278-A887-454E-987D-FFE9E37169FE}"
+	ProjectSection(SolutionItems) = preProject
+		src\Directory.Build.props = src\Directory.Build.props
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blazor.Diagrams.Core", "src\Blazor.Diagrams.Core\Blazor.Diagrams.Core.csproj", "{1A70B637-9EF8-4C25-970E-A681DEC9061C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{DA819127-3EF6-4EB9-A2DA-BC056B284A50}"
+	ProjectSection(SolutionItems) = preProject
+		samples\Directory.Build.props = samples\Directory.Build.props
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wasm", "samples\Wasm\Wasm.csproj", "{A43942BD-FDA0-4E3D-8115-BBE9D0D75DE3}"
 EndProject
@@ -23,15 +29,22 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.github\workflows\build.yml = .github\workflows\build.yml
 		CHANGELOG.md = CHANGELOG.md
+		Directory.Packages.props = Directory.Packages.props
 		.github\workflows\main.yml = .github\workflows\main.yml
 		README.md = README.md
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CEEAE4C2-CE68-4FC3-9E0F-D4781B91F7F4}"
+	ProjectSection(SolutionItems) = preProject
+		tests\Directory.Build.props = tests\Directory.Build.props
+	EndProjectSection
 EndProject
 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}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{A9FC9B20-A9F1-4066-8B59-83BD26D3B1C8}"
+	ProjectSection(SolutionItems) = preProject
+		docs\Directory.Build.props = docs\Directory.Build.props
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Diagram-Demo", "docs\Diagram-Demo\Diagram-Demo.csproj", "{5F423724-5319-4DCE-B9F2-8B2D7E1FDC17}"
 EndProject

CHANGELOG.md

@@ -5,6 +5,30 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Diagram (3.0.0) - 2024-02-24
+
+### Added
+
+- Support for .NET 8 (thanks to @[SebastianWachsmuth](https://github.com/SebastianWachsmuth))
+
+### Fixed
+
+- Link labels not showing in Firefox
+- NRE in the DemoSite's Options page (thanks to @[robertmclaws](https://github.com/robertmclaws))
+
+## Diagrams (3.0.1) - 2023-10-27
+
+### Added
+
+- `Route` property to `BaseLinkModel` to hold the result of the executed router
+
+### Fixed
+
+- Constraints not checked when using `RemoveControl` (thanks to @[K0369](https://github.com/K0369))
+- NRE Exception on the landing page demo when dragging a new link and not linking it to something (thanks to @[K0369](https://github.com/K0369))
+- `LinkVertexWidgetTests` failing on cultures that are not using a dot as decimal separator (thanks to @[K0369](https://github.com/K0369))
+- NRE exception in the Diagram Demo project (thanks to @[Suraj0500](https://github.com/Suraj0500))
+
 ## Diagrams (3.0.0) - 2023-08-14
 
 Finally, the new documentation website is here!  

Directory.Packages.props

@@ -0,0 +1,34 @@
+<Project>
+  <ItemGroup>
+    <PackageVersion Include="SvgPathProperties" Version="1.1.2" />
+    <PackageVersion Include="System.Net.Http.Json" Version="8.0.0" />
+    <PackageVersion Include="GraphShape" Version="1.2.1" />
+    <PackageVersion Include="MatBlazor" Version="2.10.0" />
+    <PackageVersion Include="bunit" Version="1.28.9" />
+    <PackageVersion Include="FluentAssertions" Version="6.12.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageVersion Include="xunit" Version="2.6.3" />
+    <PackageVersion Include="Moq" Version="[4.18.4]" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.5" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.0" />
+    <PackageVersion Include="Brutal.Dev.StrongNameSigner" Version="3.5.0" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PackageVersion Include="Microsoft.AspNetCore.Components" Version="6.0.25" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="6.0.25" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.25" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.25" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+    <PackageVersion Include="Microsoft.AspNetCore.Components" Version="7.0.14" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="7.0.14" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.14" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.14" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageVersion Include="Microsoft.AspNetCore.Components" Version="[8, 9.0.0)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="[8, 9.0.0)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="[8,9.0.0)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="[8,9.0.0)" />
+  </ItemGroup>
+</Project>

PushNuget.ps1

@@ -0,0 +1,26 @@
+pushd $PSScriptRoot
+
+$feedSource = "http://proget.wtg.zone/nuget/WTG-Internal/"
+$apiKey = ""
+$packagePath = "*.nupkg"
+
+function Write-Log {
+    Write-Host "$(get-date -f "yyyy-MM-dd HH:mm:ss.fff")`t$args"
+}
+
+try {
+    $scriptSw = [System.Diagnostics.Stopwatch]::StartNew()
+    & nuget.exe push $packagePath -ApiKey $apiKey -Source $feedSource -Verbosity detailed
+    if (-not $?)
+    {
+        Write-Log "FAILED to deploy: $packagePath)"
+    }
+    else 
+    {
+        Write-Log "Deployed $packagePath )"
+    }
+}
+finally {
+    popd
+    Write-Log "Finished (took: $($scriptSw.Elapsed))"
+} 

README.md

@@ -2,13 +2,13 @@
 
 ![](ZBD.png)
 
-Z.Blazor.Diagrams is a fully customizable and extensible all-purpose diagrams library for Blazor (both Server Side and WASM). It was first inspired by the popular React library [react-diagrams](https://github.com/projectstorm/react-diagrams), but then evolved into something much bigger. ZBD can be used to make advanced diagrams with a custom design. Even the behavior of the library is "hackable" and can be changed to suit your needs. 
+Z.Blazor.Diagrams is a fully customizable and extensible all-purpose diagrams library for Blazor (both Server Side and WASM). It was first inspired by the popular React library [react-diagrams](https://github.com/projectstorm/react-diagrams), but then evolved into something much bigger. ZBD can be used to make advanced diagrams with a custom design. Even the behavior of the library is "hackable" and can be changed to suit your needs.
+
+WTG.Z.Blazor.Diagarms is a fork of Z.Blazor.Diagrams with new features and bug fixes first targeting WiseTech Global products.
 
 | NuGet Package                | Version                                                                                                                                  | Download                                                                                                                                  |
 | ---------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| Z.Blazor.Diagrams.Core       | [![NuGet](https://img.shields.io/nuget/v/Z.Blazor.Diagrams.Core.svg)](https://www.nuget.org/packages/Z.Blazor.Diagrams.Core)             | [![Nuget](https://img.shields.io/nuget/dt/Z.Blazor.Diagrams.Core.svg)](https://www.nuget.org/packages/Z.Blazor.Diagrams.Core)             |
-| Z.Blazor.Diagrams            | [![NuGet](https://img.shields.io/nuget/v/Z.Blazor.Diagrams.svg)](https://www.nuget.org/packages/Z.Blazor.Diagrams)                       | [![Nuget](https://img.shields.io/nuget/dt/Z.Blazor.Diagrams.svg)](https://www.nuget.org/packages/Z.Blazor.Diagrams)                       |
-| Z.Blazor.Diagrams.Algorithms | [![NuGet](https://img.shields.io/nuget/v/Z.Blazor.Diagrams.Algorithms.svg)](https://www.nuget.org/packages/Z.Blazor.Diagrams.Algorithms) | [![Nuget](https://img.shields.io/nuget/dt/Z.Blazor.Diagrams.Algorithms.svg)](https://www.nuget.org/packages/Z.Blazor.Diagrams.Algorithms) |
+| WTG.Z.Blazor.Diagrams            | [![NuGet](https://img.shields.io/nuget/v/WTG.Z.Blazor.Diagrams.svg)](https://www.nuget.org/packages/WTG.Z.Blazor.Diagrams)                       | [![Nuget](https://img.shields.io/nuget/dt/WTG.Z.Blazor.Diagrams.svg)](https://www.nuget.org/packages/WTG.Z.Blazor.Diagrams)                       |
 
 | Badges     |                                                                                                                                                    |
 | ---------- | -------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -30,7 +30,7 @@ Z.Blazor.Diagrams is a fully customizable and extensible all-purpose diagrams li
 - Multi purpose
 - Touch support
 - SVG layer for links/nodes and HTML layer for nodes for maximum customizability
-- Links between nodes directly or node ports
+- Links between nodes, ports and even other links
 - Link routers, path generators, markers and labels
 - Panning, Zooming and Zooming to fit a set of nodes
 - Multi selection, deletion and region selection
@@ -48,9 +48,7 @@ Z.Blazor.Diagrams is a fully customizable and extensible all-purpose diagrams li
 You can get started very easily & quickly using:
 
 - [Documentation](https://blazor-diagrams.zhaytam.com/)
-- [Quick Start](https://blazor-diagrams.zhaytam.com/quickstart)
-- [Samples](https://blazor-diagrams.zhaytam.com/demos/simple)
-- [Docs/Demos](https://github.com/Blazor-Diagrams/Blazor.Diagrams/tree/master/docs)
+- [Installation](https://blazor-diagrams.zhaytam.com/documentation/installation)
 
 ### Sample project
 
@@ -60,9 +58,16 @@ Repository: https://github.com/Blazor-Diagrams/Blazor.DatabaseDesigner
 
 ### Contributing
 
-All kinds of contributions are welcome!  
+All kinds of contributions are welcome!
 If you're interested in helping, please create an issue or comment on an existing one to explain what you will be doing. This is because multiple people can be working on the same problem.
 
 ## Feedback
 
 If you find a bug or you want to see a functionality in this library, feel free to open an issue.
+
+## Deployment
+
+This project is hosted on NuGet. Merges to master will trigger a release action that will
+- Build WTG.Z.Blazor.Diagrams
+- Host the package on Github as a release
+- Push it to the WTG.Z.Blazor.Diagrams NuGet Gallery

WTGPublishPackageGuide.md

@@ -0,0 +1,12 @@
+# Publishing WTG.Z.Blazor.Diagrams for WTG usage
+This doc explains how the package we use at WTG is updated.
+
+When a PR is merged to master, the GitHub Action 'Create release' should run. It can also be run manually if needed. This action creates a GitHub Release and uploads the package to the release. The version number is also handled by the action. The package is created on build in the action and should contain Blazor.Diagrams.dll, Blazor.Diagrams.Core.dll and SvgPathProperties.dll
+
+## To push package to proget
+1. **Find the release**. Most likely the most recent release is the one to use. To find all releases, go to the repo main page then click 'Releases'.
+2. **Download the package**. Expand the 'Assets' section of the release and download the *.nupkg file.
+3. **Push to proget**. Modify the PushNuget.ps1 script so that it had the correct path to the downloaded *.nupkg file and the API key. Ask another team member if not sure. Once the script has all required information, run the script to push the package.
+4. **Update package version in WTG**. In Directory.Packages.Props, update the version of WTG.Z.Blazor.Diagrams to match the package that was just uploaded to proget.
+
+

build/Version.props

@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <Version></Version>
+  </PropertyGroup>
+</Project>

docs/CustomNodesLinks/CustomNodesLinks.csproj

@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\Blazor.Diagrams.Core\Blazor.Diagrams.Core.csproj" />
     <ProjectReference Include="..\..\src\Blazor.Diagrams\Blazor.Diagrams.csproj" />