From 722b4d8c383f7a7f05ea50c51d82139b71ff2ada Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Tue, 9 Jan 2024 11:02:22 +1100 Subject: [PATCH 01/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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 + From eb5a165d0312628935523be2e7830c984b126ea7 Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Thu, 11 Jan 2024 14:23:42 +1100 Subject: [PATCH 12/32] try already uploaded package --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 86cc6a91..9b5f19c2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -68,7 +68,7 @@ jobs: 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_path: package asset_name: package asset_content_type: application/zip From e57c3227be6a43b89410ec6650f269eaa5d36438 Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Thu, 11 Jan 2024 14:36:04 +1100 Subject: [PATCH 13/32] try a different action to create the release --- .github/workflows/release.yml | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9b5f19c2..8f818396 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,25 +50,11 @@ jobs: 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 }} + - name: Release + uses: softprops/action-gh-release@v1 with: + files: /home/runner/work/Blazor.Diagrams/Blazor.Diagrams/src/Blazor.Diagrams/bin/Release/*.nupkg 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: package - asset_name: package - asset_content_type: application/zip From 54e8ef94fdee6c4a48a192696a8d3f6481129555 Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Thu, 11 Jan 2024 14:42:16 +1100 Subject: [PATCH 14/32] only create release on push to master or when manually triggered --- .github/workflows/release.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8f818396..ada0329a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,8 +2,8 @@ name: Create release on: push: branches: [ master ] - pull_request: - branches: [ master ] + workflow_dispatch: + jobs: build: @@ -55,6 +55,3 @@ jobs: with: files: /home/runner/work/Blazor.Diagrams/Blazor.Diagrams/src/Blazor.Diagrams/bin/Release/*.nupkg tag_name: ${{ steps.version.outputs.version }} - prerelease: true - - From 46079e337d04c0fdf5ae041aaa15bfc5a15758cf Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Thu, 11 Jan 2024 15:04:17 +1100 Subject: [PATCH 15/32] add script and instructions --- PushNuget.ps1 | 33 +++++++++++++++++++++++++++++++++ WTGPublishPackageGuide.md | 12 ++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 PushNuget.ps1 create mode 100644 WTGPublishPackageGuide.md diff --git a/PushNuget.ps1 b/PushNuget.ps1 new file mode 100644 index 00000000..1bf27ebf --- /dev/null +++ b/PushNuget.ps1 @@ -0,0 +1,33 @@ +# To push new package to proget +# 1. in Blazor.Diagrams.csproj and Blazor.Diagrams.Core.csproj increase version number +# 2. build Blazor.Diagrams - a package will be created and it should include strong named dlls: +# Blazor.Diagrams.dll, Blazor.Diagrams.Core.dll, SvgPathProperties.dll +# 3. change the package path in this script to have the package number from the csproj +# 4. run the script (remember to put in the correct api key) + +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))" +} \ No newline at end of file diff --git a/WTGPublishPackageGuide.md b/WTGPublishPackageGuide.md new file mode 100644 index 00000000..25a714d8 --- /dev/null +++ b/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. + +## 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. + + From f299e2df5eb64954d7a1920115166f856748e534 Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Thu, 11 Jan 2024 15:05:34 +1100 Subject: [PATCH 16/32] remove commented code --- .github/workflows/build.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6ebaa0e0..1accd03d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,10 +34,6 @@ 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: Upload packages if: matrix.configuration == 'Release' uses: actions/upload-artifact@v3 From 22bf70346734bc85f1d418e7800563f1f591d1f3 Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Thu, 11 Jan 2024 15:07:35 +1100 Subject: [PATCH 17/32] update instructions --- PushNuget.ps1 | 7 ------- WTGPublishPackageGuide.md | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/PushNuget.ps1 b/PushNuget.ps1 index 1bf27ebf..eb16a480 100644 --- a/PushNuget.ps1 +++ b/PushNuget.ps1 @@ -1,10 +1,3 @@ -# To push new package to proget -# 1. in Blazor.Diagrams.csproj and Blazor.Diagrams.Core.csproj increase version number -# 2. build Blazor.Diagrams - a package will be created and it should include strong named dlls: -# Blazor.Diagrams.dll, Blazor.Diagrams.Core.dll, SvgPathProperties.dll -# 3. change the package path in this script to have the package number from the csproj -# 4. run the script (remember to put in the correct api key) - pushd $PSScriptRoot $feedSource = "http://proget.wtg.zone/nuget/WTG-Internal/" diff --git a/WTGPublishPackageGuide.md b/WTGPublishPackageGuide.md index 25a714d8..462fc9c8 100644 --- a/WTGPublishPackageGuide.md +++ b/WTGPublishPackageGuide.md @@ -1,7 +1,7 @@ # 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. +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'. From f00537df9a641d6a2aac1f94ab5bbfe48882aef7 Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Thu, 11 Jan 2024 15:08:04 +1100 Subject: [PATCH 18/32] update naming in csproj --- src/Blazor.Diagrams/Blazor.Diagrams.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Blazor.Diagrams/Blazor.Diagrams.csproj b/src/Blazor.Diagrams/Blazor.Diagrams.csproj index f5a14e0d..08509900 100644 --- a/src/Blazor.Diagrams/Blazor.Diagrams.csproj +++ b/src/Blazor.Diagrams/Blazor.Diagrams.csproj @@ -53,10 +53,10 @@ - $(TargetsForTfmSpecificBuildOutput);GetSvgPathPropertiesForPackage + $(TargetsForTfmSpecificBuildOutput);GetBinariesForPackage - + From 012f423d214cc0cdd36cb31940cdad6e4c6a4e48 Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Fri, 19 Jan 2024 09:02:32 +1100 Subject: [PATCH 19/32] remove unused action, add comments to release action --- .github/workflows/push.yml | 33 --------------------------------- .github/workflows/release.yml | 6 ++++++ 2 files changed, 6 insertions(+), 33 deletions(-) delete mode 100644 .github/workflows/push.yml diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml deleted file mode 100644 index d15fccc3..00000000 --- a/.github/workflows/push.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: PushToNuget -env: - NUGET_DIR: '${{ github.workspace }}/nuget' - -on: - workflow_dispatch: - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - - name: Pack Blazor.Diagrams.Core - working-directory: src/Blazor.Diagrams.Core - run: 'dotnet pack -p:GeneratePackageOnBuild=false --configuration Release --output ${{ env.NUGET_DIR }}' - - - name: Pack Blazor.Diagrams - working-directory: src/Blazor.Diagrams - run: 'dotnet pack -p:GeneratePackageOnBuild=false --configuration Release --output ${{ env.NUGET_DIR }}' - - - name: Pack Blazor.Diagrams.Algorithms - working-directory: src/Blazor.Diagrams.Algorithms - run: 'dotnet pack -p:GeneratePackageOnBuild=false --configuration Release --output ${{ env.NUGET_DIR }}' - - - name: Push Blazor.Diagrams.Core - run: 'dotnet nuget push ${{ env.NUGET_DIR }}/Z.Blazor.Diagrams.Core.3.0.1.nupkg --api-key "${{ secrets.NUGET_API_KEY }}" --source https://api.nuget.org/v3/index.json --skip-duplicate' - - - name: Push Blazor.Diagrams - run: 'dotnet nuget push ${{ env.NUGET_DIR }}/Z.Blazor.Diagrams.3.0.1.nupkg --api-key "${{ secrets.NUGET_API_KEY }}" --source https://api.nuget.org/v3/index.json --skip-duplicate' - - - name: Push Blazor.Diagrams.Algorithms - run: 'dotnet nuget push ${{ env.NUGET_DIR }}/Z.Blazor.Diagrams.Algorithms.3.0.1.nupkg --api-key "${{ secrets.NUGET_API_KEY }}" --source https://api.nuget.org/v3/index.json --skip-duplicate' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ada0329a..f64da086 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,5 @@ name: Create release +# On push to master branch. i.e. when we merge a PR. on: push: branches: [ master ] @@ -24,6 +25,7 @@ jobs: 6.0.x 3.1.x + # Finds the latest release and increases the version - name: Get next version uses: reecetech/version-increment@2023.9.3 id: version @@ -34,15 +36,18 @@ jobs: - name: Install version tool run: dotnet tool install -g dotnetCampus.TagToVersion + # 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@v3 with: @@ -50,6 +55,7 @@ jobs: path: /home/runner/work/Blazor.Diagrams/Blazor.Diagrams/src/Blazor.Diagrams/bin/Release/*.nupkg retention-days: 5 + # Create a new release and upload the package to the release - name: Release uses: softprops/action-gh-release@v1 with: From 21fdaa588e8651068054fbc9a77306f6d639c9af Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Fri, 19 Jan 2024 09:03:28 +1100 Subject: [PATCH 20/32] run action on push to PR so that I can check it works with latest changes --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f64da086..61a15727 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,6 +3,8 @@ name: Create release on: push: branches: [ master ] + pull_request: + branches: [ master ] workflow_dispatch: From c09cde6a44e840369f3dd59c5230363df1051ded Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Fri, 19 Jan 2024 09:09:14 +1100 Subject: [PATCH 21/32] remove versions from csproj - they dont seem to be needed --- src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj | 2 -- src/Blazor.Diagrams/Blazor.Diagrams.csproj | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj b/src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj index 5ee23be5..2a048bbd 100644 --- a/src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj +++ b/src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj @@ -7,8 +7,6 @@ MIT zHaytam A fully customizable and extensible all-purpose diagrams library for Blazor - 1.0 - 1.0 https://github.com/WiseTechGlobal/Blazor.Diagrams WTG.Z.Blazor.Diagrams.Core blazor diagrams diagramming svg drag diff --git a/src/Blazor.Diagrams/Blazor.Diagrams.csproj b/src/Blazor.Diagrams/Blazor.Diagrams.csproj index 08509900..8e2864ea 100644 --- a/src/Blazor.Diagrams/Blazor.Diagrams.csproj +++ b/src/Blazor.Diagrams/Blazor.Diagrams.csproj @@ -5,8 +5,6 @@ enable zHaytam MIT - 1.0 - 1.0 https://github.com/WiseTechGlobal/Blazor.Diagrams A fully customizable and extensible all-purpose diagrams library for Blazor true From 51515d0caacc2ca202d1536024941b40090e3ed8 Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Fri, 19 Jan 2024 09:17:25 +1100 Subject: [PATCH 22/32] Revert "run action on push to PR so that I can check it works with latest changes" This reverts commit 21fdaa588e8651068054fbc9a77306f6d639c9af. --- .github/workflows/release.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 61a15727..f64da086 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,8 +3,6 @@ name: Create release on: push: branches: [ master ] - pull_request: - branches: [ master ] workflow_dispatch: From 87ec41b2415b1e3e6087d3d91f7f0c15b94dcdf4 Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Mon, 22 Jan 2024 15:56:08 +1100 Subject: [PATCH 23/32] always use release config, package path variable --- .github/workflows/release.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f64da086..d8d8369a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,15 +4,13 @@ on: push: branches: [ master ] workflow_dispatch: - + +env: + PACKAGE_Path: /home/runner/work/Blazor.Diagrams/Blazor.Diagrams/src/Blazor.Diagrams/bin/Release/*.nupkg jobs: build: - name: Build - ${{ matrix.configuration }} - - strategy: - matrix: - configuration: [ Release ] + name: Build - Release runs-on: ubuntu-latest steps: @@ -52,12 +50,12 @@ jobs: uses: actions/upload-artifact@v3 with: name: package - path: /home/runner/work/Blazor.Diagrams/Blazor.Diagrams/src/Blazor.Diagrams/bin/Release/*.nupkg + path: $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: /home/runner/work/Blazor.Diagrams/Blazor.Diagrams/src/Blazor.Diagrams/bin/Release/*.nupkg + files: $PACKAGE_PATH tag_name: ${{ steps.version.outputs.version }} From 48689056949a3aea257c74a032fb3ab829890e9c Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Mon, 22 Jan 2024 16:04:25 +1100 Subject: [PATCH 24/32] add wtg as author --- src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj | 2 +- src/Blazor.Diagrams/Blazor.Diagrams.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj b/src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj index 2a048bbd..163567b7 100644 --- a/src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj +++ b/src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj @@ -5,7 +5,7 @@ enable false MIT - zHaytam + zHaytam, WiseTech Global A fully customizable and extensible all-purpose diagrams library for Blazor https://github.com/WiseTechGlobal/Blazor.Diagrams WTG.Z.Blazor.Diagrams.Core diff --git a/src/Blazor.Diagrams/Blazor.Diagrams.csproj b/src/Blazor.Diagrams/Blazor.Diagrams.csproj index 8e2864ea..c674d4a8 100644 --- a/src/Blazor.Diagrams/Blazor.Diagrams.csproj +++ b/src/Blazor.Diagrams/Blazor.Diagrams.csproj @@ -3,7 +3,7 @@ net6.0 enable - zHaytam + zHaytam, WiseTech Global MIT https://github.com/WiseTechGlobal/Blazor.Diagrams A fully customizable and extensible all-purpose diagrams library for Blazor From 77094a3196423eed29806cc30eb9fe53946537cd Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Mon, 22 Jan 2024 16:12:55 +1100 Subject: [PATCH 25/32] remove version from version.props --- build/Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Version.props b/build/Version.props index bc42f294..2420175e 100644 --- a/build/Version.props +++ b/build/Version.props @@ -1,5 +1,5 @@ - 1.0.9 + \ No newline at end of file From 289f0ed4e547965c08fb55113df3f18246b67998 Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Fri, 19 Jan 2024 09:03:28 +1100 Subject: [PATCH 26/32] run action on push to PR so that I can check it works with latest changes --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d8d8369a..c3f22e47 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,6 +3,8 @@ name: Create release on: push: branches: [ master ] + pull_request: + branches: [ master ] workflow_dispatch: env: From 68b5bd8f5300226790acedf4ca16650446d919cb Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Mon, 22 Jan 2024 16:17:10 +1100 Subject: [PATCH 27/32] add package version for TagToVersion --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c3f22e47..b6a335a4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,7 +34,7 @@ jobs: increment: patch - name: Install version tool - run: dotnet tool install -g dotnetCampus.TagToVersion + run: dotnet tool install dotnetCampus.TagToVersion -g --version 1.0.11 # Writes the new version number to build/Version.props - name: Set version From 1ae48601650750db81bf67d51ef79592e67ce504 Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Mon, 22 Jan 2024 16:19:02 +1100 Subject: [PATCH 28/32] try add quotes for variable --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b6a335a4..6976845b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -52,12 +52,12 @@ jobs: uses: actions/upload-artifact@v3 with: name: package - path: $PACKAGE_PATH + path: "$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: $PACKAGE_PATH + files: "$PACKAGE_PATH" tag_name: ${{ steps.version.outputs.version }} From 687cb721a8cf7f04f9a7142947ab115288086697 Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Mon, 22 Jan 2024 16:21:34 +1100 Subject: [PATCH 29/32] try use curly braces for variable --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6976845b..fcb46dc1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -52,12 +52,12 @@ jobs: uses: actions/upload-artifact@v3 with: name: package - path: "$PACKAGE_PATH" + path: ${{ 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: "$PACKAGE_PATH" + files: ${{ PACKAGE_PATH }} tag_name: ${{ steps.version.outputs.version }} From e6d2c81bb562bf5cce217bdfeb63fea37ee631e2 Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Mon, 22 Jan 2024 16:24:50 +1100 Subject: [PATCH 30/32] try variables again --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fcb46dc1..8882a587 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -52,12 +52,12 @@ jobs: uses: actions/upload-artifact@v3 with: name: package - path: ${{ PACKAGE_PATH }} + 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: ${{ PACKAGE_PATH }} + files: ${{ env.PACKAGE_PATH }} tag_name: ${{ steps.version.outputs.version }} From 0b05a4f4094020e54c2b8fe7712762d3209e9704 Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Mon, 22 Jan 2024 16:32:13 +1100 Subject: [PATCH 31/32] fix typo --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8882a587..454cf9ee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: workflow_dispatch: env: - PACKAGE_Path: /home/runner/work/Blazor.Diagrams/Blazor.Diagrams/src/Blazor.Diagrams/bin/Release/*.nupkg + PACKAGE_PATH: /home/runner/work/Blazor.Diagrams/Blazor.Diagrams/src/Blazor.Diagrams/bin/Release/*.nupkg jobs: build: From bf6ff36727621684f0358ce2f32800e6b69950a2 Mon Sep 17 00:00:00 2001 From: Heather Cox Date: Mon, 22 Jan 2024 16:37:20 +1100 Subject: [PATCH 32/32] Revert "run action on push to PR so that I can check it works with latest changes" This reverts commit 289f0ed4e547965c08fb55113df3f18246b67998. --- .github/workflows/release.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 454cf9ee..6ce136ca 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,8 +3,6 @@ name: Create release on: push: branches: [ master ] - pull_request: - branches: [ master ] workflow_dispatch: env: