From 1332c77b068e9df2293282ddf9b994c5fff1aea8 Mon Sep 17 00:00:00 2001 From: Matt Swain Date: Mon, 1 May 2023 11:03:41 +1000 Subject: [PATCH 1/9] update readme --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index dcd2df3ca..a067dab17 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,9 @@ ![](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. + +This project is a fork of the original library which will be maintained by WTG. | NuGet Package | Version | Download | | ---------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | From f2224a30af5d6c9e2b96d556edf67596bc34f86e Mon Sep 17 00:00:00 2001 From: Matt Swain Date: Tue, 2 May 2023 10:55:04 +1000 Subject: [PATCH 2/9] test githib actions --- .github/workflows/build.yml | 50 +++++++++++-------------------------- .github/workflows/main.yml | 25 ------------------- 2 files changed, 14 insertions(+), 61 deletions(-) delete mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8be6ac023..8aba8b971 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,45 +1,23 @@ name: Build on: push: - branches: - - master + branches: [ master ] pull_request: - types: [opened, synchronize, reopened] + branches: [ master ] + jobs: build: name: Build 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: '6.0.x' + - name: Install dependencies + run: dotnet restore + - name: Build + run: dotnet build + - name: Test with the dotnet CLI + run: dotnet test diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index 3aa3f9816..000000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: DeployDemoToGitHubPages -env: - PUBLISH_DIR: samples/Wasm/bin/Release/netstandard2.1/publish/wwwroot - -on: - push: - branches: [ master ] - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - - name: Publish app - run: cd samples/Wasm && dotnet publish -c Release - - - name: GitHub Pages - if: success() - uses: crazy-max/ghaction-github-pages@v1.5.1 - with: - target_branch: gh-pages - build_dir: ${{ env.PUBLISH_DIR }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 4c76616605399a726d05229c76b045480994957f Mon Sep 17 00:00:00 2001 From: Matt Swain Date: Tue, 2 May 2023 10:55:25 +1000 Subject: [PATCH 3/9] revert readme change --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index a067dab17..971036bb0 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,6 @@ 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. -This project is a fork of the original library which will be maintained by WTG. - | 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) | From f1a3e0c694f2773b4f6e0d9b4dd14851e2b12e6a Mon Sep 17 00:00:00 2001 From: Matt Swain Date: Tue, 2 May 2023 10:56:32 +1000 Subject: [PATCH 4/9] ficed readme reverted change --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 971036bb0..dcd2df3ca 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ![](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. | NuGet Package | Version | Download | | ---------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | From ef9eced5be39759bd77ee26d1f88a9c09bfdbd65 Mon Sep 17 00:00:00 2001 From: Matt Swain Date: Tue, 2 May 2023 11:40:07 +1000 Subject: [PATCH 5/9] rename --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8aba8b971..f35a74f8b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Build +name: Build and Test on: push: branches: [ master ] From f64ebd6bcb33258e4b83ca165de961d7a20760a8 Mon Sep 17 00:00:00 2001 From: Matt Swain Date: Tue, 2 May 2023 11:56:31 +1000 Subject: [PATCH 6/9] addd dotnet 3.1.x --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f35a74f8b..23f9abd8a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,9 @@ jobs: - name: Setup dotnet uses: actions/setup-dotnet@v3 with: - dotnet-version: '6.0.x' + dotnet-version: | + 6.0.x + 3.1.x - name: Install dependencies run: dotnet restore - name: Build From c787a652b60b8e9951d5d880c061821770434de0 Mon Sep 17 00:00:00 2001 From: Matt Swain Date: Tue, 2 May 2023 15:33:51 +1000 Subject: [PATCH 7/9] build debug and release --- .github/workflows/build.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 23f9abd8a..ecc8e465f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,19 +7,29 @@ on: jobs: build: - name: Build + name: Build - ${{ matrix.configuration }} + + strategy: + matrix: + configuration: [ Debug, Release ] + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - name: Setup dotnet uses: actions/setup-dotnet@v3 with: dotnet-version: | 6.0.x 3.1.x + - name: Install dependencies run: dotnet restore + - name: Build - run: dotnet build - - name: Test with the dotnet CLI - run: dotnet test + run: dotnet build --configuration ${{ matrix.configuration }} + + - name: Test + if: matrix.configuration == 'Debug' + run: dotnet test --no-build From 310d9130330afbc533af27e633dcb3c39004204d Mon Sep 17 00:00:00 2001 From: Matt Swain Date: Tue, 2 May 2023 15:48:54 +1000 Subject: [PATCH 8/9] upload artifact --- .github/workflows/build.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ecc8e465f..ff735dda8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,3 +33,14 @@ jobs: - name: Test if: matrix.configuration == 'Debug' run: dotnet test --no-build + + - name: Pack + if: matrix.configuration == 'Release' + run: dotnet pack --configuration ${{ matrix.configuration }} -o packages + + - name: Upload packages + if: matrix.configuration == 'Release' + uses: actions/upload-artifact@v3 + with: + name: packages + path: packages/ From 8460752be4ca52650f4a3448f22671f098e8994e Mon Sep 17 00:00:00 2001 From: Matt Swain Date: Tue, 2 May 2023 15:52:24 +1000 Subject: [PATCH 9/9] added retention days for packages --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ff735dda8..23fd31588 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,3 +44,4 @@ jobs: with: name: packages path: packages/ + retention-days: 5