Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,17 @@ jobs:
- name: Install dependencies
run: dotnet restore

- name: Debug NuGet Packages Path
run: dotnet nuget locals global-packages -l

# - name: Find File Recursively
# run: |
# FILE_PATH=$(find $GITHUB_WORKSPACE -type f -name "StrongNameSigner.Console.exe")
# echo "Found file at: $FILE_PATH"

# - name: Install Mono
# run: sudo apt-get update && sudo apt-get install -y mono-runtime

- name: Build
run: dotnet build --configuration ${{ matrix.configuration }}

Expand Down
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<Project>
<ItemGroup>
<PackageVersion Include="Brutal.Dev.StrongNameSigner" Version="3.5.1" />
<PackageVersion Include="SvgPathProperties" Version="1.1.2" />
<PackageVersion Include="System.Net.Http.Json" Version="8.0.0" />
<PackageVersion Include="GraphShape" Version="1.2.1" />
Expand All @@ -11,7 +12,6 @@
<PackageVersion Include="Moq" Version="[4.18.4]" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.5" />
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
<PackageVersion Include="Brutal.Dev.StrongNameSigner" Version="3.5.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="6.0.25" />
Expand Down
6 changes: 3 additions & 3 deletions src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<PackageIcon>ZBD.png</PackageIcon>
<PackageProjectUrl>https://blazor-diagrams.zhaytam.com/</PackageProjectUrl>
<PackageReadmeFile>README.md</PackageReadmeFile>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\Blazor.Diagrams\sgKey.snk</AssemblyOriginatorKeyFile>
<!-- <SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\Blazor.Diagrams\sgKey.snk</AssemblyOriginatorKeyFile> -->
</PropertyGroup>

<ItemGroup>
Expand All @@ -29,8 +29,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Brutal.Dev.StrongNameSigner" />
<PackageReference Include="SvgPathProperties" />
<PackageReference Include="Brutal.Dev.StrongNameSigner" PrivateAssets="All"/>
</ItemGroup>

</Project>
4 changes: 3 additions & 1 deletion src/Blazor.Diagrams.Core/Models/Base/SelectableModel.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using System;
using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("Blazor.Diagrams.Core.Tests")]
[assembly: InternalsVisibleTo("Blazor.Diagrams.Tests")]
namespace Blazor.Diagrams.Core.Models.Base;

public abstract class SelectableModel : Model
Expand Down
20 changes: 15 additions & 5 deletions src/Blazor.Diagrams/Blazor.Diagrams.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,15 @@
<Product>WTG.Z.Blazor.Diagrams</Product>
<PackageIcon>ZBD.png</PackageIcon>
<PackageReadmeFile>README.md</PackageReadmeFile>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>sgKey.snk</AssemblyOriginatorKeyFile>
<!-- <SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>sgKey.snk</AssemblyOriginatorKeyFile> -->
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" />
<PackageReference Include="Brutal.Dev.StrongNameSigner" PrivateAssets="All" />
<!-- Reference the SvgPathProperties that we already strong name signed -->
<PackageReference Include="SvgPathProperties" PrivateAssets="All" />
<PackageReference Include="Brutal.Dev.StrongNameSigner" />
<PackageReference Include="SvgPathProperties" />
</ItemGroup>

<ItemGroup>
Expand All @@ -40,7 +39,18 @@
</None>
</ItemGroup>

<!-- <PropertyGroup>
<NuGetPackageRoot Condition="'$(NuGetPackageRoot)' == ''">$(USERPROFILE)\.nuget\packages\</NuGetPackageRoot>
</PropertyGroup> -->

<Target Name="TestWebCompiler" AfterTargets="BeforeBuild">
<!-- <Message Text="NuGetPackageRoot: $(NuGetPackageRoot)" Importance="high" />
<Exec Command="echo NuGetPackageRoot: $(NuGetPackageRoot)" /> -->

<!-- Run Strong Name Signer -->
<!-- <Exec ContinueOnError="false"
Command="mono &quot;/home/runner/work/Blazor.Diagrams/Blazor.Diagrams/packages/brutal.dev.strongnamesigner/3.5.1/build/StrongNameSigner.Console.exe&quot; -in &quot;/home/runner/work/Blazor.Diagrams/Blazor.Diagrams/packages/&quot;" /> -->

<!-- Test if Excubo.WebCompiler is installed (recommended) -->
<Exec Command="webcompiler -h" ContinueOnError="true" StandardOutputImportance="low" StandardErrorImportance="low" LogStandardErrorAsError="false" IgnoreExitCode="true">
<Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<IsPackable>false</IsPackable>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\src\Blazor.Diagrams\sgKey.snk</AssemblyOriginatorKeyFile>
<!-- <SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\src\Blazor.Diagrams\sgKey.snk</AssemblyOriginatorKeyFile> -->
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions tests/Blazor.Diagrams.Tests/Blazor.Diagrams.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<PropertyGroup>
<IsPackable>false</IsPackable>
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\src\Blazor.Diagrams\sgKey.snk</AssemblyOriginatorKeyFile>
<!-- <SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\src\Blazor.Diagrams\sgKey.snk</AssemblyOriginatorKeyFile> -->
</PropertyGroup>

<ItemGroup>
Expand Down
Loading