Skip to content

Commit

Permalink
Merge branch 'dev' into issue/OSOE-867
Browse files Browse the repository at this point in the history
  • Loading branch information
Psichorex committed Jun 11, 2024
2 parents e39b80b + 999addd commit 5accb71
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 45 deletions.
13 changes: 0 additions & 13 deletions Lombiq.ChartJs.Samples/License.md

This file was deleted.

3 changes: 1 addition & 2 deletions Lombiq.ChartJs.Samples/Lombiq.ChartJs.Samples.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@
<PackageTags>OrchardCore;Lombiq;AspNetCore;Chart.js</PackageTags>
<RepositoryUrl>https://github.com/Lombiq/Orchard-Chart.js</RepositoryUrl>
<PackageProjectUrl>https://github.com/Lombiq/Orchard-Chart.js/blob/dev/Lombiq.ChartJs.Samples/Readme.md</PackageProjectUrl>
<PackageLicenseFile>License.md</PackageLicenseFile>
<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
</PropertyGroup>

<ItemGroup>
<None Include="License.md" Pack="true" PackagePath="" />
<None Include="Readme.md" />
<None Include="NuGetIcon.png" Pack="true" PackagePath="" />
</ItemGroup>
Expand Down
13 changes: 0 additions & 13 deletions Lombiq.ChartJs.Tests.UI/License.md

This file was deleted.

3 changes: 1 addition & 2 deletions Lombiq.ChartJs.Tests.UI/Lombiq.ChartJs.Tests.UI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<PackageTags>OrchardCore;Lombiq;AspNetCore;Chart.js</PackageTags>
<RepositoryUrl>https://github.com/Lombiq/Orchard-Chart.js</RepositoryUrl>
<PackageProjectUrl>https://github.com/Lombiq/Orchard-Chart.js/blob/dev/Lombiq.ChartJs.Tests.UI/Readme.md</PackageProjectUrl>
<PackageLicenseFile>License.md</PackageLicenseFile>
<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
</PropertyGroup>

<ItemGroup>
Expand All @@ -40,7 +40,6 @@
</ItemGroup>

<ItemGroup>
<None Include="License.md" Pack="true" PackagePath="" />
<None Include="NuGetIcon.png" Pack="true" PackagePath="" />
<None Include="Readme.md" />
</ItemGroup>
Expand Down
13 changes: 0 additions & 13 deletions Lombiq.ChartJs/License.md

This file was deleted.

3 changes: 1 addition & 2 deletions Lombiq.ChartJs/Lombiq.ChartJs.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@
<PackageTags>OrchardCore;Lombiq;AspNetCore;Chart.js;chart</PackageTags>
<RepositoryUrl>https://github.com/Lombiq/Orchard-Chart.js</RepositoryUrl>
<PackageProjectUrl>https://github.com/Lombiq/Orchard-Chart.js</PackageProjectUrl>
<PackageLicenseFile>License.md</PackageLicenseFile>
<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
</PropertyGroup>

<ItemGroup>
<None Include="License.md" Pack="true" PackagePath="" />
<None Include="NuGetIcon.png" Pack="true" PackagePath="" />
<None Include="..\Readme.md" />
<None Remove="node_modules\**" />
Expand Down

0 comments on commit 5accb71

Please sign in to comment.