From 722b4d8c383f7a7f05ea50c51d82139b71ff2ada Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Tue, 9 Jan 2024 11:02:22 +1100 Subject: [PATCH 01/11] updates to csproj files --- .../Blazor.Diagrams.Core.csproj | 16 +++++---- src/Blazor.Diagrams/Blazor.Diagrams.csproj | 32 +++++++++++++----- src/Blazor.Diagrams/sgKey.snk | Bin 0 -> 596 bytes .../Blazor.Diagrams.Core.Tests.csproj | 4 ++- .../Blazor.Diagrams.Tests.csproj | 5 ++- 5 files changed, 39 insertions(+), 18 deletions(-) create mode 100644 src/Blazor.Diagrams/sgKey.snk diff --git a/src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj b/src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj index cb81f620..ed920d05 100644 --- a/src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj +++ b/src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj @@ -3,20 +3,22 @@ net6.0 enable - true + false MIT zHaytam A fully customizable and extensible all-purpose diagrams library for Blazor - 3.0.1 - 3.0.1 - https://github.com/Blazor-Diagrams/Blazor.Diagrams - 3.0.1 - Z.Blazor.Diagrams.Core + 1.0 + 1.0 + https://github.com/WiseTechGlobal/Blazor.Diagrams + 1.0.8 + WTG.Z.Blazor.Diagrams.Core blazor diagrams diagramming svg drag - Z.Blazor.Diagrams.Core + WTG.Z.Blazor.Diagrams.Core ZBD.png https://blazor-diagrams.zhaytam.com/ README.md + True + ..\Blazor.Diagrams\sgKey.snk diff --git a/src/Blazor.Diagrams/Blazor.Diagrams.csproj b/src/Blazor.Diagrams/Blazor.Diagrams.csproj index 3e806eb7..ccaa9d66 100644 --- a/src/Blazor.Diagrams/Blazor.Diagrams.csproj +++ b/src/Blazor.Diagrams/Blazor.Diagrams.csproj @@ -5,27 +5,30 @@ enable zHaytam MIT - 3.0.1 - 3.0.1 - https://github.com/Blazor-Diagrams/Blazor.Diagrams + 1.0 + 1.0 + https://github.com/WiseTechGlobal/Blazor.Diagrams A fully customizable and extensible all-purpose diagrams library for Blazor - 3.0.1 + 1.0.8 true blazor diagrams diagramming svg drag - Z.Blazor.Diagrams + WTG.Z.Blazor.Diagrams https://blazor-diagrams.zhaytam.com/ - Z.Blazor.Diagrams + WTG.Z.Blazor.Diagrams ZBD.png README.md + True + sgKey.snk - - + + + - + @@ -50,4 +53,15 @@ + + $(TargetsForTfmSpecificBuildOutput);GetSvgPathPropertiesForPackage + + + + + + + + + diff --git a/src/Blazor.Diagrams/sgKey.snk b/src/Blazor.Diagrams/sgKey.snk new file mode 100644 index 0000000000000000000000000000000000000000..4ff3c2f7af87363f0b25898c10cc329400e87b78 GIT binary patch literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa500988oXQ;m1bZb&aY5KX2?36AKA5Z#D-Gv;e(N%l^$KwkcE~?YqYx_-#ir}YRb3QJNM7W zaJ9SUK??)9%#nnEKtmyn z1-du!oIu-It4P7jlG;D#C)XS4W6dIe^SPf%cz**qtU zKv%@yGJVNIzfO3VJ5)Bb)}foP%7W#=lW3E>H&xtNLqo00`-9Y8pQyy`O|8ifEd;lH z6|YD(us{fm_G>6z i@4=d*Tm9Mkw5g0pb1xCoGqhw~Od4{t{sVa5_I1G(6cEn< literal 0 HcmV?d00001 diff --git a/tests/Blazor.Diagrams.Core.Tests/Blazor.Diagrams.Core.Tests.csproj b/tests/Blazor.Diagrams.Core.Tests/Blazor.Diagrams.Core.Tests.csproj index 0e1f0d2f..ee3b3ec3 100644 --- a/tests/Blazor.Diagrams.Core.Tests/Blazor.Diagrams.Core.Tests.csproj +++ b/tests/Blazor.Diagrams.Core.Tests/Blazor.Diagrams.Core.Tests.csproj @@ -4,13 +4,15 @@ net6.0 enable false + True + ..\..\src\Blazor.Diagrams\sgKey.snk - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/Blazor.Diagrams.Tests/Blazor.Diagrams.Tests.csproj b/tests/Blazor.Diagrams.Tests/Blazor.Diagrams.Tests.csproj index dead3f03..96fa147b 100644 --- a/tests/Blazor.Diagrams.Tests/Blazor.Diagrams.Tests.csproj +++ b/tests/Blazor.Diagrams.Tests/Blazor.Diagrams.Tests.csproj @@ -5,6 +5,8 @@ enable false true + True + ..\..\src\Blazor.Diagrams\sgKey.snk @@ -12,7 +14,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -25,6 +27,7 @@ + From c98c40b5b1e9a0e452f8210096c5cf17ab8c38f2 Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Tue, 9 Jan 2024 11:05:28 +1100 Subject: [PATCH 02/11] add public key for internals visible --- src/Blazor.Diagrams.Core/Diagram.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Blazor.Diagrams.Core/Diagram.cs b/src/Blazor.Diagrams.Core/Diagram.cs index 61b8b09f..99e43bcd 100644 --- a/src/Blazor.Diagrams.Core/Diagram.cs +++ b/src/Blazor.Diagrams.Core/Diagram.cs @@ -12,10 +12,9 @@ using Blazor.Diagrams.Core.Controls; using Blazor.Diagrams.Core.Behaviors.Base; -[assembly: InternalsVisibleTo("Blazor.Diagrams")] -[assembly: InternalsVisibleTo("Blazor.Diagrams.Tests")] -[assembly: InternalsVisibleTo("Blazor.Diagrams.Core.Tests")] - +[assembly: InternalsVisibleTo("Blazor.Diagrams, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b19ccf452d560c78a01faeff3ea2dd095ebc2b24abb6ce02394e44ecc5fad730037d475c0678cbfc201a727462866c8148fe30e0171816b7569e0d0e74f01d741cd84dfde651f0d817a74e1121566b66759566601eceaf504566c83a9c1fd9b574c48652f0e183919f951e5dd39085964a6bb4bb1edf3c15226acab7d73bf7cf")] +[assembly: InternalsVisibleTo("Blazor.Diagrams.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b19ccf452d560c78a01faeff3ea2dd095ebc2b24abb6ce02394e44ecc5fad730037d475c0678cbfc201a727462866c8148fe30e0171816b7569e0d0e74f01d741cd84dfde651f0d817a74e1121566b66759566601eceaf504566c83a9c1fd9b574c48652f0e183919f951e5dd39085964a6bb4bb1edf3c15226acab7d73bf7cf")] +[assembly: InternalsVisibleTo("Blazor.Diagrams.Core.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b19ccf452d560c78a01faeff3ea2dd095ebc2b24abb6ce02394e44ecc5fad730037d475c0678cbfc201a727462866c8148fe30e0171816b7569e0d0e74f01d741cd84dfde651f0d817a74e1121566b66759566601eceaf504566c83a9c1fd9b574c48652f0e183919f951e5dd39085964a6bb4bb1edf3c15226acab7d73bf7cf")] namespace Blazor.Diagrams.Core; public abstract class Diagram From 9c43b5fb3c6fad37ed3c84f3a8151eb250a95eaf Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Tue, 9 Jan 2024 11:35:57 +1100 Subject: [PATCH 03/11] fix package versions --- src/Blazor.Diagrams/Blazor.Diagrams.csproj | 4 ++-- .../Blazor.Diagrams.Core.Tests.csproj | 2 +- tests/Blazor.Diagrams.Tests/Blazor.Diagrams.Tests.csproj | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Blazor.Diagrams/Blazor.Diagrams.csproj b/src/Blazor.Diagrams/Blazor.Diagrams.csproj index ccaa9d66..02ca708e 100644 --- a/src/Blazor.Diagrams/Blazor.Diagrams.csproj +++ b/src/Blazor.Diagrams/Blazor.Diagrams.csproj @@ -22,8 +22,8 @@ - - + + diff --git a/tests/Blazor.Diagrams.Core.Tests/Blazor.Diagrams.Core.Tests.csproj b/tests/Blazor.Diagrams.Core.Tests/Blazor.Diagrams.Core.Tests.csproj index ee3b3ec3..11c8ea2c 100644 --- a/tests/Blazor.Diagrams.Core.Tests/Blazor.Diagrams.Core.Tests.csproj +++ b/tests/Blazor.Diagrams.Core.Tests/Blazor.Diagrams.Core.Tests.csproj @@ -12,7 +12,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/Blazor.Diagrams.Tests/Blazor.Diagrams.Tests.csproj b/tests/Blazor.Diagrams.Tests/Blazor.Diagrams.Tests.csproj index 96fa147b..a2895c11 100644 --- a/tests/Blazor.Diagrams.Tests/Blazor.Diagrams.Tests.csproj +++ b/tests/Blazor.Diagrams.Tests/Blazor.Diagrams.Tests.csproj @@ -14,7 +14,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all From 006d37ea234e5fcc01ecc17af5d5d9a4c87cbcb3 Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Tue, 9 Jan 2024 11:20:04 +1100 Subject: [PATCH 04/11] add nuget config, brutal dev to blazor diagrams core --- nuget.config | 6 ++++++ src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj | 1 + 2 files changed, 7 insertions(+) create mode 100644 nuget.config diff --git a/nuget.config b/nuget.config new file mode 100644 index 00000000..8d053120 --- /dev/null +++ b/nuget.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj b/src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj index ed920d05..a223645e 100644 --- a/src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj +++ b/src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj @@ -34,6 +34,7 @@ + From faf22894027734ef696ceb68458a2ab676d0e715 Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Thu, 11 Jan 2024 11:20:38 +1100 Subject: [PATCH 05/11] only upload package created on build --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 98fc1e5c..db598f66 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,14 +34,14 @@ jobs: if: matrix.configuration == 'Debug' run: dotnet test --no-build - - name: Pack - if: matrix.configuration == 'Release' - run: dotnet pack --configuration ${{ matrix.configuration }} -o packages --no-build + #- name: Pack + # if: matrix.configuration == 'Release' + # run: dotnet pack --configuration ${{ matrix.configuration }} -o packages --no-build - name: Upload packages if: matrix.configuration == 'Release' uses: actions/upload-artifact@v3 with: - name: packages - path: packages/ + name: package + path: src\Blazor.Diagrams\bin\Release\*.nupkg retention-days: 5 From bb9645f602ff3be9c62f8a76d7a9d4df84abea29 Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Thu, 11 Jan 2024 11:37:26 +1100 Subject: [PATCH 06/11] update path to package --- .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 db598f66..6ebaa0e0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,5 +43,5 @@ jobs: uses: actions/upload-artifact@v3 with: name: package - path: src\Blazor.Diagrams\bin\Release\*.nupkg + path: /home/runner/work/Blazor.Diagrams/Blazor.Diagrams/src/Blazor.Diagrams/bin/Release/*.nupkg retention-days: 5 From 0d0fb50138b887b71c916f3d5f4ef14b30260c7b Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Thu, 11 Jan 2024 12:53:25 +1100 Subject: [PATCH 07/11] add release github action --- .github/workflows/release.yml | 48 +++++++++++++++++++ Directory.Build.props | 3 ++ build/Version.props | 5 ++ .../Blazor.Diagrams.Core.csproj | 1 - src/Blazor.Diagrams/Blazor.Diagrams.csproj | 1 - 5 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/release.yml create mode 100644 Directory.Build.props create mode 100644 build/Version.props diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 00000000..de26dc2e --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,48 @@ +name: Build and Test +on: + push: + branches: [ master ] + tags: + - '*' + pull_request: + branches: [ master ] + tags: + - '*' + +jobs: + build: + name: Build - ${{ matrix.configuration }} + + strategy: + matrix: + configuration: [ 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 version tool + run: dotnet tool install -g dotnetCampus.TagToVersion + + - name: Set version + run: dotnet TagToVersion -t ${{ github.ref }} + + - name: Install dependencies + run: dotnet restore + + - name: Build + run: dotnet build --configuration Release + + - name: Upload packages + uses: actions/upload-artifact@v3 + with: + name: package + path: /home/runner/work/Blazor.Diagrams/Blazor.Diagrams/src/Blazor.Diagrams/bin/Release/*.nupkg + retention-days: 5 diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 00000000..2c52bf20 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/build/Version.props b/build/Version.props new file mode 100644 index 00000000..bc42f294 --- /dev/null +++ b/build/Version.props @@ -0,0 +1,5 @@ + + + 1.0.9 + + \ No newline at end of file diff --git a/src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj b/src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj index a223645e..5ee23be5 100644 --- a/src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj +++ b/src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj @@ -10,7 +10,6 @@ 1.0 1.0 https://github.com/WiseTechGlobal/Blazor.Diagrams - 1.0.8 WTG.Z.Blazor.Diagrams.Core blazor diagrams diagramming svg drag WTG.Z.Blazor.Diagrams.Core diff --git a/src/Blazor.Diagrams/Blazor.Diagrams.csproj b/src/Blazor.Diagrams/Blazor.Diagrams.csproj index 02ca708e..f5a14e0d 100644 --- a/src/Blazor.Diagrams/Blazor.Diagrams.csproj +++ b/src/Blazor.Diagrams/Blazor.Diagrams.csproj @@ -9,7 +9,6 @@ 1.0 https://github.com/WiseTechGlobal/Blazor.Diagrams A fully customizable and extensible all-purpose diagrams library for Blazor - 1.0.8 true blazor diagrams diagramming svg drag WTG.Z.Blazor.Diagrams From af1eb976f9b3b6bc3c9221987bb7a8f97917c624 Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Thu, 11 Jan 2024 13:11:30 +1100 Subject: [PATCH 08/11] try auto increment version --- .github/workflows/release.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index de26dc2e..523f3863 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,13 +1,9 @@ -name: Build and Test +name: Create release on: push: branches: [ master ] - tags: - - '*' pull_request: branches: [ master ] - tags: - - '*' jobs: build: @@ -28,11 +24,18 @@ jobs: 6.0.x 3.1.x + - name: Get next version + uses: reecetech/version-increment@2023.9.3 + id: version + with: + scheme: semver + increment: patch + - name: Install version tool run: dotnet tool install -g dotnetCampus.TagToVersion - name: Set version - run: dotnet TagToVersion -t ${{ github.ref }} + run: dotnet TagToVersion -t ${{ steps.version.outputs.version }} - name: Install dependencies run: dotnet restore From fed637b592f6e4d4d892dd90558c6dd124defc4b Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Thu, 11 Jan 2024 14:16:03 +1100 Subject: [PATCH 09/11] create release --- .github/workflows/release.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 523f3863..07dddc62 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -49,3 +49,24 @@ jobs: name: package path: /home/runner/work/Blazor.Diagrams/Blazor.Diagrams/src/Blazor.Diagrams/bin/Release/*.nupkg retention-days: 5 + + - name: Create Release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ steps.version.outputs.version }} + release_name: Release ${{ steps.version.outputs.version }} + draft: false + prerelease: true + + - name: Upload Release Asset + id: upload-release-asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps + asset_path: /home/runner/work/Blazor.Diagrams/Blazor.Diagrams/src/Blazor.Diagrams/bin/Release/*.nupkg + asset_name: package From 0a153f6b1cbeb9eb7697547abda4227433bd6f86 Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Thu, 11 Jan 2024 14:17:18 +1100 Subject: [PATCH 10/11] fix format --- .github/workflows/release.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 07dddc62..8a0ec702 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,22 +51,22 @@ jobs: retention-days: 5 - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ steps.version.outputs.version }} - release_name: Release ${{ steps.version.outputs.version }} - draft: false - prerelease: true + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ steps.version.outputs.version }} + release_name: Release ${{ steps.version.outputs.version }} + draft: false + prerelease: true - name: Upload Release Asset - id: upload-release-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: /home/runner/work/Blazor.Diagrams/Blazor.Diagrams/src/Blazor.Diagrams/bin/Release/*.nupkg - asset_name: package + id: upload-release-asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps + asset_path: /home/runner/work/Blazor.Diagrams/Blazor.Diagrams/src/Blazor.Diagrams/bin/Release/*.nupkg + asset_name: package From 4f12f36846edfe8c6a6a935d159e42c407b30278 Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Thu, 11 Jan 2024 14:21:00 +1100 Subject: [PATCH 11/11] add content type --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8a0ec702..86cc6a91 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -70,3 +70,5 @@ jobs: upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps asset_path: /home/runner/work/Blazor.Diagrams/Blazor.Diagrams/src/Blazor.Diagrams/bin/Release/*.nupkg asset_name: package + asset_content_type: application/zip +