From 722b4d8c383f7a7f05ea50c51d82139b71ff2ada Mon Sep 17 00:00:00 2001 From: Heather Cox <Heather.Cox@wisetechglobal.com> Date: Tue, 9 Jan 2024 11:02:22 +1100 Subject: [PATCH 01/10] 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 @@ <PropertyGroup> <TargetFramework>net6.0</TargetFramework> <Nullable>enable</Nullable> - <GeneratePackageOnBuild>true</GeneratePackageOnBuild> + <GeneratePackageOnBuild>false</GeneratePackageOnBuild> <PackageLicenseExpression>MIT</PackageLicenseExpression> <Authors>zHaytam</Authors> <Description>A fully customizable and extensible all-purpose diagrams library for Blazor</Description> - <AssemblyVersion>3.0.1</AssemblyVersion> - <FileVersion>3.0.1</FileVersion> - <RepositoryUrl>https://github.com/Blazor-Diagrams/Blazor.Diagrams</RepositoryUrl> - <Version>3.0.1</Version> - <PackageId>Z.Blazor.Diagrams.Core</PackageId> + <AssemblyVersion>1.0</AssemblyVersion> + <FileVersion>1.0</FileVersion> + <RepositoryUrl>https://github.com/WiseTechGlobal/Blazor.Diagrams</RepositoryUrl> + <Version>1.0.8</Version> + <PackageId>WTG.Z.Blazor.Diagrams.Core</PackageId> <PackageTags>blazor diagrams diagramming svg drag</PackageTags> - <Product>Z.Blazor.Diagrams.Core</Product> + <Product>WTG.Z.Blazor.Diagrams.Core</Product> <PackageIcon>ZBD.png</PackageIcon> <PackageProjectUrl>https://blazor-diagrams.zhaytam.com/</PackageProjectUrl> <PackageReadmeFile>README.md</PackageReadmeFile> + <SignAssembly>True</SignAssembly> + <AssemblyOriginatorKeyFile>..\Blazor.Diagrams\sgKey.snk</AssemblyOriginatorKeyFile> </PropertyGroup> <ItemGroup> 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 @@ <Nullable>enable</Nullable> <Authors>zHaytam</Authors> <PackageLicenseExpression>MIT</PackageLicenseExpression> - <AssemblyVersion>3.0.1</AssemblyVersion> - <FileVersion>3.0.1</FileVersion> - <RepositoryUrl>https://github.com/Blazor-Diagrams/Blazor.Diagrams</RepositoryUrl> + <AssemblyVersion>1.0</AssemblyVersion> + <FileVersion>1.0</FileVersion> + <RepositoryUrl>https://github.com/WiseTechGlobal/Blazor.Diagrams</RepositoryUrl> <Description>A fully customizable and extensible all-purpose diagrams library for Blazor</Description> - <Version>3.0.1</Version> + <Version>1.0.8</Version> <GeneratePackageOnBuild>true</GeneratePackageOnBuild> <PackageTags>blazor diagrams diagramming svg drag</PackageTags> - <PackageId>Z.Blazor.Diagrams</PackageId> + <PackageId>WTG.Z.Blazor.Diagrams</PackageId> <PackageProjectUrl>https://blazor-diagrams.zhaytam.com/</PackageProjectUrl> - <Product>Z.Blazor.Diagrams</Product> + <Product>WTG.Z.Blazor.Diagrams</Product> <PackageIcon>ZBD.png</PackageIcon> <PackageReadmeFile>README.md</PackageReadmeFile> + <SignAssembly>True</SignAssembly> + <AssemblyOriginatorKeyFile>sgKey.snk</AssemblyOriginatorKeyFile> </PropertyGroup> <ItemGroup> - <PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.25" /> - <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.25" /> + <PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.0" /> + <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.0" /> + <PackageReference Include="Brutal.Dev.StrongNameSigner" Version="3.3.3" PrivateAssets="All"/> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\Blazor.Diagrams.Core\Blazor.Diagrams.Core.csproj" /> + <ProjectReference Include="..\Blazor.Diagrams.Core\Blazor.Diagrams.Core.csproj" PrivateAssets="All"/> </ItemGroup> <ItemGroup> @@ -50,4 +53,15 @@ <Exec Command="webcompiler -r wwwroot" StandardOutputImportance="high" StandardErrorImportance="high" /> </Target> + <PropertyGroup> + <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);GetSvgPathPropertiesForPackage</TargetsForTfmSpecificBuildOutput> + </PropertyGroup> + + <Target Name="GetSvgPathPropertiesForPackage"> + <ItemGroup> + <BuildOutputInPackage Include="$(OutputPath)Blazor.Diagrams.Core.dll;..\..\packages\svgpathproperties\1.1.2\lib\netstandard2.0\SvgPathProperties.dll"> + </BuildOutputInPackage> + </ItemGroup> + </Target> + </Project> 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$aES1ONa500988oX<rqRt$KcAFlsCqTLBzyelNDw$1`M zPDJd*`qwZ6eMejdc+31C8gg`EhHQaI{xIMd7#6oyo(&Fk@Evp<*iHTBQSjIor%n+e zR%>Q;m1bZb&aY5KX2?36AKA5Z#D-Gv;e(N%l^$KwkcE~?YqYx_-#ir}YRb3QJNM7W zaJ9SUK??)<xuW0*%t6W8?54lP3}65KAM7cH7uFodzldrZ3_c*LKVY>9%#nnEKtmyn z1-du!oI<aZ-1q0lex<Tr5=@epaKs9>u-It4P7jlG;D#C)XS4W6dIe^SPf%cz**qtU zKv%@yGJVNIzfO3VJ5)Bb)}foP%7W#=lW3E>H&xtNLqo00`-9Y8pQyy`O|8ifEd;lH z6|YD(us{fm_G>6<O1+XP8YT!oO3RE+8w;V9I)7O!)-VJGl4}?mGv;W=+u?1~|BP$q z@-Y*hSnGIuEjTyQ;1z&IE|#+qw@+a$PA3H0xH^2bgAg51+ZVVXZv?HCkw(D+RZQ}( zXaQbvGGlM#1*SKX&jgweEPUnidG|{_Qk3GNhaJFViw-WQb)vAkW}E|zM<Z8W8yimJ z%|-^B()F@gEAU9jiQ8mEz!*BjX%Gqv@E&DbWO<oAYFf4AJSjlYNsac*88^6ALv?SN zB|B~<K@$tH2u~R259TeQ7N&DLXFQRMRz*qluMh$6g%Ws@+?vsb1TtqEIJnRrAAh>z 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 @@ <TargetFramework>net6.0</TargetFramework> <Nullable>enable</Nullable> <IsPackable>false</IsPackable> + <SignAssembly>True</SignAssembly> + <AssemblyOriginatorKeyFile>..\..\src\Blazor.Diagrams\sgKey.snk</AssemblyOriginatorKeyFile> </PropertyGroup> <ItemGroup> <PackageReference Include="FluentAssertions" Version="5.10.3" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" /> <PackageReference Include="xunit" Version="2.4.1" /> - <PackageReference Include="Moq" Version="[4.18.4]" /> + <PackageReference Include="Moq" Version="4.16.1" /> <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3"> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <PrivateAssets>all</PrivateAssets> 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 @@ <Nullable>enable</Nullable> <IsPackable>false</IsPackable> <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles> + <SignAssembly>True</SignAssembly> + <AssemblyOriginatorKeyFile>..\..\src\Blazor.Diagrams\sgKey.snk</AssemblyOriginatorKeyFile> </PropertyGroup> <ItemGroup> @@ -12,7 +14,7 @@ <PackageReference Include="FluentAssertions" Version="5.10.3" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" /> <PackageReference Include="xunit" Version="2.4.1" /> - <PackageReference Include="Moq" Version="[4.18.4]" /> + <PackageReference Include="Moq" Version="4.16.1" /> <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3"> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <PrivateAssets>all</PrivateAssets> @@ -25,6 +27,7 @@ <ItemGroup> <ProjectReference Include="..\..\src\Blazor.Diagrams\Blazor.Diagrams.csproj" /> + <ProjectReference Include="..\..\src\Blazor.Diagrams.Core\Blazor.Diagrams.Core.csproj" /> </ItemGroup> </Project> From c98c40b5b1e9a0e452f8210096c5cf17ab8c38f2 Mon Sep 17 00:00:00 2001 From: Heather Cox <Heather.Cox@wisetechglobal.com> Date: Tue, 9 Jan 2024 11:05:28 +1100 Subject: [PATCH 02/10] 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 <Heather.Cox@wisetechglobal.com> Date: Tue, 9 Jan 2024 11:35:57 +1100 Subject: [PATCH 03/10] 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 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.0" /> - <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.0" /> + <PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.25" /> + <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.25" /> <PackageReference Include="Brutal.Dev.StrongNameSigner" Version="3.3.3" PrivateAssets="All"/> </ItemGroup> 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 @@ <PackageReference Include="FluentAssertions" Version="5.10.3" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" /> <PackageReference Include="xunit" Version="2.4.1" /> - <PackageReference Include="Moq" Version="4.16.1" /> + <PackageReference Include="Moq" Version="[4.18.4]" /> <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3"> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <PrivateAssets>all</PrivateAssets> 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 @@ <PackageReference Include="FluentAssertions" Version="5.10.3" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" /> <PackageReference Include="xunit" Version="2.4.1" /> - <PackageReference Include="Moq" Version="4.16.1" /> + <PackageReference Include="Moq" Version="[4.18.4]" /> <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3"> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <PrivateAssets>all</PrivateAssets> From 006d37ea234e5fcc01ecc17af5d5d9a4c87cbcb3 Mon Sep 17 00:00:00 2001 From: Heather Cox <Heather.Cox@wisetechglobal.com> Date: Tue, 9 Jan 2024 11:20:04 +1100 Subject: [PATCH 04/10] 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 @@ +<?xml version="1.0" encoding="utf-8"?> +<configuration> + <config> + <add key="globalPackagesFolder" value=".\packages" /> + </config> +</configuration> \ 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 @@ <ItemGroup> <PackageReference Include="SvgPathProperties" Version="1.1.2" /> + <PackageReference Include="Brutal.Dev.StrongNameSigner" Version="3.3.3" PrivateAssets="All"/> </ItemGroup> </Project> From faf22894027734ef696ceb68458a2ab676d0e715 Mon Sep 17 00:00:00 2001 From: Heather Cox <Heather.Cox@wisetechglobal.com> Date: Thu, 11 Jan 2024 11:20:38 +1100 Subject: [PATCH 05/10] 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 <Heather.Cox@wisetechglobal.com> Date: Thu, 11 Jan 2024 11:37:26 +1100 Subject: [PATCH 06/10] 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 <Heather.Cox@wisetechglobal.com> Date: Thu, 11 Jan 2024 12:53:25 +1100 Subject: [PATCH 07/10] 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 @@ +<Project> + <Import Project="build\Version.props" /> +</Project> \ 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 @@ +<Project> + <PropertyGroup> + <Version>1.0.9</Version> + </PropertyGroup> +</Project> \ 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 @@ <AssemblyVersion>1.0</AssemblyVersion> <FileVersion>1.0</FileVersion> <RepositoryUrl>https://github.com/WiseTechGlobal/Blazor.Diagrams</RepositoryUrl> - <Version>1.0.8</Version> <PackageId>WTG.Z.Blazor.Diagrams.Core</PackageId> <PackageTags>blazor diagrams diagramming svg drag</PackageTags> <Product>WTG.Z.Blazor.Diagrams.Core</Product> 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 @@ <FileVersion>1.0</FileVersion> <RepositoryUrl>https://github.com/WiseTechGlobal/Blazor.Diagrams</RepositoryUrl> <Description>A fully customizable and extensible all-purpose diagrams library for Blazor</Description> - <Version>1.0.8</Version> <GeneratePackageOnBuild>true</GeneratePackageOnBuild> <PackageTags>blazor diagrams diagramming svg drag</PackageTags> <PackageId>WTG.Z.Blazor.Diagrams</PackageId> From af1eb976f9b3b6bc3c9221987bb7a8f97917c624 Mon Sep 17 00:00:00 2001 From: Heather Cox <Heather.Cox@wisetechglobal.com> Date: Thu, 11 Jan 2024 13:11:30 +1100 Subject: [PATCH 08/10] 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 <Heather.Cox@wisetechglobal.com> Date: Thu, 11 Jan 2024 14:16:03 +1100 Subject: [PATCH 09/10] 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 <Heather.Cox@wisetechglobal.com> Date: Thu, 11 Jan 2024 14:17:18 +1100 Subject: [PATCH 10/10] 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