Skip to content

Commit

Permalink
Merge pull request #102 from Lombiq/issue/OSOE-852
Browse files Browse the repository at this point in the history
OSOE-852: Change NuGet metadata to use license expression
  • Loading branch information
Piedone authored Jun 11, 2024
2 parents 297b5af + 069100a commit 01a1b7d
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 84 deletions.
13 changes: 0 additions & 13 deletions Lombiq.Analyzers.NetFx/License.md

This file was deleted.

5 changes: 2 additions & 3 deletions Lombiq.Analyzers.NetFx/Lombiq.Analyzers.NetFx.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
<DefaultItemExcludes>$(DefaultItemExcludes);.git*;</DefaultItemExcludes>
<!-- This is duplicated with Lombiq.Analyzers.NetFx.nuspec.template but is needed for the NuGet publishing workflow
not to throw a warning. See https://github.com/Lombiq/GitHub-Actions/issues/236. -->
<PackageLicenseFile>License.md</PackageLicenseFile>
<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
</PropertyGroup>

<!-- This project is built with an externally generated .nuspec file so NuGet-related properties are not needed here.
The package properties can be updated in the Lombiq.Analyzers.NetFx.nuspec.template file. The dependencies are
created from the AnalyzerPackages.props file, although if needed further dependencies can be added to
Lombiq.Analyzers.NetFx.nuspec.template as well.
-->

<ItemGroup>
<!-- Note how these files need to be linked form Lombiq.Analyzers, without a dependency so .NET Framework projects
don't get .NET configs from its Build.props. -->
Expand All @@ -22,7 +22,6 @@
<None Include="..\Lombiq.Analyzers\Lombiq.Analyzers.globalconfig" Link="Lombiq.Analyzers.globalconfig" Pack="true" PackagePath="" />
<None Include="..\Lombiq.Analyzers\SonarLint.xml" Link="SonarLint.xml" Pack="true" PackagePath="" />
<None Include="..\Lombiq.Analyzers\stylecop.json" Link="stylecop.json" Pack="true" PackagePath="" />
<None Include="License.md" Pack="true" PackagePath="" />
<None Include="Readme.md" Link="Readme.md" />
<None Include="NuGetIcon.png" Pack="true" PackagePath="" />
<None Include="build\**" Pack="true" PackagePath="build\" />
Expand Down
13 changes: 0 additions & 13 deletions Lombiq.Analyzers.Orchard1/License.md

This file was deleted.

7 changes: 3 additions & 4 deletions Lombiq.Analyzers.Orchard1/Lombiq.Analyzers.Orchard1.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,24 @@
<DefaultItemExcludes>$(DefaultItemExcludes);.git*;</DefaultItemExcludes>
<!-- This is duplicated with Lombiq.Analyzers.Orchard1.nuspec.template but is needed for the NuGet publishing
workflow not to throw a warning. See https://github.com/Lombiq/GitHub-Actions/issues/236. -->
<PackageLicenseFile>License.md</PackageLicenseFile>
<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
</PropertyGroup>

<!-- This project is built with an externally generated .nuspec file so NuGet-related properties are not needed here.
The package properties can be updated in the Lombiq.Analyzers.Orchard1.nuspec.template file. The dependencies are
created from the AnalyzerPackages.props file, although if needed further dependencies can be added to
Lombiq.Analyzers.Orchard1.nuspec.template as well.
-->

<ItemGroup>
<None Include="..\Lombiq.Analyzers.OrchardCore\Lombiq.Analyzers.OrchardCore.globalconfig" Link="Lombiq.Analyzers.OrchardCore.globalconfig" Pack="true" PackagePath="" />
<None Include="License.md" Pack="true" PackagePath="" />
<None Include="Readme.md" Link="Readme.md" />
<None Include="NuGetIcon.png" Pack="true" PackagePath="" />
<None Include="build\**" Pack="true" PackagePath="build\" />
<None Include="*.props" Pack="true" PackagePath="" />
<None Include="*.globalconfig" Pack="true" PackagePath="" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Lombiq.Analyzers.NetFx\Lombiq.Analyzers.NetFx.csproj" />
</ItemGroup>
Expand Down
13 changes: 0 additions & 13 deletions Lombiq.Analyzers.OrchardCore/License.md

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,23 @@
<DefaultItemExcludes>$(DefaultItemExcludes);.git*;</DefaultItemExcludes>
<!-- This is duplicated with Lombiq.Analyzers.OrchardCore.nuspec.template but is needed for the NuGet publishing
workflow not to throw a warning. See https://github.com/Lombiq/GitHub-Actions/issues/236. -->
<PackageLicenseFile>License.md</PackageLicenseFile>
<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
</PropertyGroup>

<!-- This project is built with an externally generated .nuspec file so NuGet-related properties are not needed here.
The package properties can be updated in the Lombiq.Analyzers.OrchardCore.nuspec.template file. The dependencies
are created from the AnalyzerPackages.props file, although if needed further dependencies can be added to
Lombiq.Analyzers.OrchardCore.nuspec.template as well.
-->

<ItemGroup>
<None Include="License.md" Pack="true" PackagePath="" />
<None Include="Readme.md" Link="Readme.md" />
<None Include="NuGetIcon.png" Pack="true" PackagePath="" />
<None Include="build\**" Pack="true" PackagePath="build\" />
<None Include="*.props" Pack="true" PackagePath="" />
<None Include="*.globalconfig" Pack="true" PackagePath="" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Lombiq.Analyzers\Lombiq.Analyzers.csproj" />
</ItemGroup>
Expand Down
13 changes: 0 additions & 13 deletions Lombiq.Analyzers.VisualStudioExtension/License.md

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,23 @@
<DefaultItemExcludes>$(DefaultItemExcludes);.git*;</DefaultItemExcludes>
<!-- This is duplicated with Lombiq.Analyzers.VisualStudioExtension.nuspec.template but is needed for the NuGet
publishing workflow not to throw a warning. See https://github.com/Lombiq/GitHub-Actions/issues/236. -->
<PackageLicenseFile>License.md</PackageLicenseFile>
<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
</PropertyGroup>

<!-- This project is built with an externally generated .nuspec file so NuGet-related properties are not needed here.
The package properties can be updated in the Lombiq.Analyzers.VisualStudioExtension.nuspec.template file. The
dependencies are created from the AnalyzerPackages.props file, although if needed further dependencies can be
added to Lombiq.Analyzers.VisualStudioExtension.nuspec.template as well.
-->

<ItemGroup>
<None Include="License.md" Pack="true" PackagePath="" />
<None Include="Readme.md" Link="Readme.md" />
<None Include="NuGetIcon.png" Pack="true" PackagePath="" />
<None Include="build\**" Pack="true" PackagePath="build\" />
<None Include="*.props" Pack="true" PackagePath="" />
<None Include="*.globalconfig" Pack="true" PackagePath="" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Lombiq.Analyzers.NetFx\Lombiq.Analyzers.NetFx.csproj" />
</ItemGroup>
Expand Down
13 changes: 0 additions & 13 deletions Lombiq.Analyzers/License.md

This file was deleted.

7 changes: 3 additions & 4 deletions Lombiq.Analyzers/Lombiq.Analyzers.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,16 @@
<DefaultItemExcludes>$(DefaultItemExcludes);.git*;</DefaultItemExcludes>
<!-- This is duplicated with Lombiq.Analyzers.nuspec.template but is needed for the NuGet publishing workflow not to
throw a warning. See https://github.com/Lombiq/GitHub-Actions/issues/236. -->
<PackageLicenseFile>License.md</PackageLicenseFile>
<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
</PropertyGroup>

<!-- This project is built with an externally generated .nuspec file so NuGet-related properties are not needed here.
The package properties can be updated in the Lombiq.Analyzers.nuspec.template file. The dependencies are created
from the AnalyzerPackages.props file, although if needed further dependencies can be added to
from the AnalyzerPackages.props file, although if needed further dependencies can be added to
Lombiq.Analyzers.nuspec.template as well.
-->

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

0 comments on commit 01a1b7d

Please sign in to comment.