Skip to content

Commit af63ea6

Browse files
HeathermcxHeathermcx
authored
Merge eb5a165 into 5f6626c 
2 parents 5f6626c + eb5a165 commit af63ea6

File tree

11 files changed

+131
-24
lines changed

11 files changed

+131
-24
lines changed

‎.github/workflows/build.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ jobs:
3434
if: matrix.configuration == 'Debug'
3535
run: dotnet test --no-build
3636

37-
- name: Pack
38-
if: matrix.configuration == 'Release'
39-
run: dotnet pack --configuration ${{ matrix.configuration }} -o packages --no-build
37+
#- name: Pack
38+
# if: matrix.configuration == 'Release'
39+
# run: dotnet pack --configuration ${{ matrix.configuration }} -o packages --no-build
4040

4141
- name: Upload packages
4242
if: matrix.configuration == 'Release'
4343
uses: actions/upload-artifact@v3
4444
with:
45-
name: packages
46-
path: packages/
45+
name: package
46+
path: /home/runner/work/Blazor.Diagrams/Blazor.Diagrams/src/Blazor.Diagrams/bin/Release/*.nupkg
4747
retention-days: 5

‎.github/workflows/release.yml‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
name: Create release
2+
on:
3+
push:
4+
branches: [ master ]
5+
pull_request:
6+
branches: [ master ]
7+
8+
jobs:
9+
build:
10+
name: Build - ${{ matrix.configuration }}
11+
12+
strategy:
13+
matrix:
14+
configuration: [ Release ]
15+
16+
runs-on: ubuntu-latest
17+
steps:
18+
- uses: actions/checkout@v3
19+
20+
- name: Setup dotnet
21+
uses: actions/setup-dotnet@v3
22+
with:
23+
dotnet-version: |
24+
6.0.x
25+
3.1.x
26+
27+
- name: Get next version
28+
uses: reecetech/[email protected]
29+
id: version
30+
with:
31+
scheme: semver
32+
increment: patch
33+
34+
- name: Install version tool
35+
run: dotnet tool install -g dotnetCampus.TagToVersion
36+
37+
- name: Set version
38+
run: dotnet TagToVersion -t ${{ steps.version.outputs.version }}
39+
40+
- name: Install dependencies
41+
run: dotnet restore
42+
43+
- name: Build
44+
run: dotnet build --configuration Release
45+
46+
- name: Upload packages
47+
uses: actions/upload-artifact@v3
48+
with:
49+
name: package
50+
path: /home/runner/work/Blazor.Diagrams/Blazor.Diagrams/src/Blazor.Diagrams/bin/Release/*.nupkg
51+
retention-days: 5
52+
53+
- name: Create Release
54+
id: create_release
55+
uses: actions/create-release@v1
56+
env:
57+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
58+
with:
59+
tag_name: ${{ steps.version.outputs.version }}
60+
release_name: Release ${{ steps.version.outputs.version }}
61+
draft: false
62+
prerelease: true
63+
64+
- name: Upload Release Asset
65+
id: upload-release-asset
66+
uses: actions/upload-release-asset@v1
67+
env:
68+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
69+
with:
70+
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
71+
asset_path: package
72+
asset_name: package
73+
asset_content_type: application/zip
74+

‎Directory.Build.props‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<Import Project="build\Version.props" />
3+
</Project>

‎build/Version.props‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Project>
2+
<PropertyGroup>
3+
<Version>1.0.9</Version>
4+
</PropertyGroup>
5+
</Project>

‎nuget.config‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<config>
4+
<add key="globalPackagesFolder" value=".\packages" />
5+
</config>
6+
</configuration>

‎src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,21 @@
33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
55
<Nullable>enable</Nullable>
6-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
6+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
77
<PackageLicenseExpression>MIT</PackageLicenseExpression>
88
<Authors>zHaytam</Authors>
99
<Description>A fully customizable and extensible all-purpose diagrams library for Blazor</Description>
10-
<AssemblyVersion>3.0.1</AssemblyVersion>
11-
<FileVersion>3.0.1</FileVersion>
12-
<RepositoryUrl>https://github.com/Blazor-Diagrams/Blazor.Diagrams</RepositoryUrl>
13-
<Version>3.0.1</Version>
14-
<PackageId>Z.Blazor.Diagrams.Core</PackageId>
10+
<AssemblyVersion>1.0</AssemblyVersion>
11+
<FileVersion>1.0</FileVersion>
12+
<RepositoryUrl>https://github.com/WiseTechGlobal/Blazor.Diagrams</RepositoryUrl>
13+
<PackageId>WTG.Z.Blazor.Diagrams.Core</PackageId>
1514
<PackageTags>blazor diagrams diagramming svg drag</PackageTags>
16-
<Product>Z.Blazor.Diagrams.Core</Product>
15+
<Product>WTG.Z.Blazor.Diagrams.Core</Product>
1716
<PackageIcon>ZBD.png</PackageIcon>
1817
<PackageProjectUrl>https://blazor-diagrams.zhaytam.com/</PackageProjectUrl>
1918
<PackageReadmeFile>README.md</PackageReadmeFile>
19+
<SignAssembly>True</SignAssembly>
20+
<AssemblyOriginatorKeyFile>..\Blazor.Diagrams\sgKey.snk</AssemblyOriginatorKeyFile>
2021
</PropertyGroup>
2122

2223
<ItemGroup>
@@ -32,6 +33,7 @@
3233

3334
<ItemGroup>
3435
<PackageReference Include="SvgPathProperties" Version="1.1.2" />
36+
<PackageReference Include="Brutal.Dev.StrongNameSigner" Version="3.3.3" PrivateAssets="All"/>
3537
</ItemGroup>
3638

3739
</Project>

‎src/Blazor.Diagrams.Core/Diagram.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@
1212
using Blazor.Diagrams.Core.Controls;
1313
using Blazor.Diagrams.Core.Behaviors.Base;
1414

15-
[assembly: InternalsVisibleTo("Blazor.Diagrams")]
16-
[assembly: InternalsVisibleTo("Blazor.Diagrams.Tests")]
17-
[assembly: InternalsVisibleTo("Blazor.Diagrams.Core.Tests")]
18-
15+
[assembly: InternalsVisibleTo("Blazor.Diagrams, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b19ccf452d560c78a01faeff3ea2dd095ebc2b24abb6ce02394e44ecc5fad730037d475c0678cbfc201a727462866c8148fe30e0171816b7569e0d0e74f01d741cd84dfde651f0d817a74e1121566b66759566601eceaf504566c83a9c1fd9b574c48652f0e183919f951e5dd39085964a6bb4bb1edf3c15226acab7d73bf7cf")]
16+
[assembly: InternalsVisibleTo("Blazor.Diagrams.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b19ccf452d560c78a01faeff3ea2dd095ebc2b24abb6ce02394e44ecc5fad730037d475c0678cbfc201a727462866c8148fe30e0171816b7569e0d0e74f01d741cd84dfde651f0d817a74e1121566b66759566601eceaf504566c83a9c1fd9b574c48652f0e183919f951e5dd39085964a6bb4bb1edf3c15226acab7d73bf7cf")]
17+
[assembly: InternalsVisibleTo("Blazor.Diagrams.Core.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b19ccf452d560c78a01faeff3ea2dd095ebc2b24abb6ce02394e44ecc5fad730037d475c0678cbfc201a727462866c8148fe30e0171816b7569e0d0e74f01d741cd84dfde651f0d817a74e1121566b66759566601eceaf504566c83a9c1fd9b574c48652f0e183919f951e5dd39085964a6bb4bb1edf3c15226acab7d73bf7cf")]
1918
namespace Blazor.Diagrams.Core;
2019

2120
public abstract class Diagram

‎src/Blazor.Diagrams/Blazor.Diagrams.csproj‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,29 @@
55
<Nullable>enable</Nullable>
66
<Authors>zHaytam</Authors>
77
<PackageLicenseExpression>MIT</PackageLicenseExpression>
8-
<AssemblyVersion>3.0.1</AssemblyVersion>
9-
<FileVersion>3.0.1</FileVersion>
10-
<RepositoryUrl>https://github.com/Blazor-Diagrams/Blazor.Diagrams</RepositoryUrl>
8+
<AssemblyVersion>1.0</AssemblyVersion>
9+
<FileVersion>1.0</FileVersion>
10+
<RepositoryUrl>https://github.com/WiseTechGlobal/Blazor.Diagrams</RepositoryUrl>
1111
<Description>A fully customizable and extensible all-purpose diagrams library for Blazor</Description>
12-
<Version>3.0.1</Version>
1312
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1413
<PackageTags>blazor diagrams diagramming svg drag</PackageTags>
15-
<PackageId>Z.Blazor.Diagrams</PackageId>
14+
<PackageId>WTG.Z.Blazor.Diagrams</PackageId>
1615
<PackageProjectUrl>https://blazor-diagrams.zhaytam.com/</PackageProjectUrl>
17-
<Product>Z.Blazor.Diagrams</Product>
16+
<Product>WTG.Z.Blazor.Diagrams</Product>
1817
<PackageIcon>ZBD.png</PackageIcon>
1918
<PackageReadmeFile>README.md</PackageReadmeFile>
19+
<SignAssembly>True</SignAssembly>
20+
<AssemblyOriginatorKeyFile>sgKey.snk</AssemblyOriginatorKeyFile>
2021
</PropertyGroup>
2122

2223
<ItemGroup>
2324
<PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.25" />
2425
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.25" />
26+
<PackageReference Include="Brutal.Dev.StrongNameSigner" Version="3.3.3" PrivateAssets="All"/>
2527
</ItemGroup>
2628

2729
<ItemGroup>
28-
<ProjectReference Include="..\Blazor.Diagrams.Core\Blazor.Diagrams.Core.csproj" />
30+
<ProjectReference Include="..\Blazor.Diagrams.Core\Blazor.Diagrams.Core.csproj" PrivateAssets="All"/>
2931
</ItemGroup>
3032

3133
<ItemGroup>
@@ -50,4 +52,15 @@
5052
<Exec Command="webcompiler -r wwwroot" StandardOutputImportance="high" StandardErrorImportance="high" />
5153
</Target>
5254

55+
<PropertyGroup>
56+
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);GetSvgPathPropertiesForPackage</TargetsForTfmSpecificBuildOutput>
57+
</PropertyGroup>
58+
59+
<Target Name="GetSvgPathPropertiesForPackage">
60+
<ItemGroup>
61+
<BuildOutputInPackage Include="$(OutputPath)Blazor.Diagrams.Core.dll;..\..\packages\svgpathproperties\1.1.2\lib\netstandard2.0\SvgPathProperties.dll">
62+
</BuildOutputInPackage>
63+
</ItemGroup>
64+
</Target>
65+
5366
</Project>

‎src/Blazor.Diagrams/sgKey.snk‎

596 Bytes
Binary file not shown.

‎tests/Blazor.Diagrams.Core.Tests/Blazor.Diagrams.Core.Tests.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<TargetFramework>net6.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<IsPackable>false</IsPackable>
7+
<SignAssembly>True</SignAssembly>
8+
<AssemblyOriginatorKeyFile>..\..\src\Blazor.Diagrams\sgKey.snk</AssemblyOriginatorKeyFile>
79
</PropertyGroup>
810

911
<ItemGroup>

0 commit comments

Comments
 (0)