Merge remote-tracking branch 'origin/dev' into issue/OSOE-867

Lombiq · Jun 11, 2024 · eea6302 · eea6302
2 parents b25237d + b30fcfd
commit eea6302
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 94 deletions.
diff --git a/Lombiq.Hosting.MediaTheme.Bridge.Tests.UI/License.md b/Lombiq.Hosting.MediaTheme.Bridge.Tests.UI/License.md
diff --git a/Lombiq.Hosting.MediaTheme.Bridge.Tests.UI/Lombiq.Hosting.MediaTheme.Bridge.Tests.UI.csproj b/Lombiq.Hosting.MediaTheme.Bridge.Tests.UI/Lombiq.Hosting.MediaTheme.Bridge.Tests.UI.csproj
@@ -14,12 +14,11 @@
         <PackageTags>OrchardCore;Lombiq;AspNetCore;Media;Theme</PackageTags>
         <RepositoryUrl>https://github.com/Lombiq/Hosting-Media-Theme</RepositoryUrl>
         <PackageProjectUrl>https://github.com/Lombiq/Hosting-Media-Theme/blob/dev/Readme.md</PackageProjectUrl>
-        <PackageLicenseFile>License.md</PackageLicenseFile>
+        <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
     </PropertyGroup>
 
     <ItemGroup>
         <None Remove="node_modules\**" />
-        <None Include="License.md" Pack="true" PackagePath="" />
         <None Include="NuGetIcon.png" Pack="true" PackagePath="" />
     </ItemGroup>
 

diff --git a/Lombiq.Hosting.MediaTheme.Bridge/License.md b/Lombiq.Hosting.MediaTheme.Bridge/License.md
diff --git a/Lombiq.Hosting.MediaTheme.Bridge/Lombiq.Hosting.MediaTheme.Bridge.csproj b/Lombiq.Hosting.MediaTheme.Bridge/Lombiq.Hosting.MediaTheme.Bridge.csproj
@@ -14,12 +14,11 @@
     <PackageTags>OrchardCore;Lombiq;AspNetCore;Media;Module</PackageTags>
     <RepositoryUrl>https://github.com/Lombiq/Hosting-Media-Theme</RepositoryUrl>
     <PackageProjectUrl>https://github.com/Lombiq/Hosting-Media-Theme</PackageProjectUrl>
-    <PackageLicenseFile>License.md</PackageLicenseFile>
+    <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
   </PropertyGroup>
 
   <ItemGroup>
     <None Remove="node_modules\**" />
-    <None Include="License.md" Pack="true" PackagePath="" />
     <None Include="NuGetIcon.png" Pack="true" PackagePath="" />
   </ItemGroup>
 

diff --git a/Lombiq.Hosting.MediaTheme.Deployer/License.md b/Lombiq.Hosting.MediaTheme.Deployer/License.md
diff --git a/Lombiq.Hosting.MediaTheme.Deployer/Lombiq.Hosting.MediaTheme.Deployer.csproj b/Lombiq.Hosting.MediaTheme.Deployer/Lombiq.Hosting.MediaTheme.Deployer.csproj
@@ -9,7 +9,7 @@
     <PackageTags>OrchardCore;Lombiq;AspNetCore;Media;Deployer</PackageTags>
     <RepositoryUrl>https://github.com/Lombiq/Hosting-Media-Theme</RepositoryUrl>
     <PackageProjectUrl>https://github.com/Lombiq/Hosting-Media-Theme</PackageProjectUrl>
-    <PackageLicenseFile>License.md</PackageLicenseFile>
+    <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -30,7 +30,6 @@
   <ItemGroup>
     <None Include="..\.github\actions\deploy-media-theme\action.yml" Link=".github\action.yml" />
     <None Include="..\.github\workflows\deploy-media-theme.yml" Link=".github\deploy-media-theme.yml" />
-    <None Include="License.md" Pack="true" PackagePath="" />
     <None Include="NuGetIcon.png" Pack="true" PackagePath="" />
   </ItemGroup>
 

diff --git a/Lombiq.Hosting.MediaTheme.Targets/License.md b/Lombiq.Hosting.MediaTheme.Targets/License.md
diff --git a/Lombiq.Hosting.MediaTheme.Targets/Lombiq.Hosting.MediaTheme.Targets.csproj b/Lombiq.Hosting.MediaTheme.Targets/Lombiq.Hosting.MediaTheme.Targets.csproj
@@ -15,11 +15,10 @@
     <PackageTags>OrchardCore;Lombiq;AspNetCore;MSBuild,Media;Targets</PackageTags>
     <RepositoryUrl>https://github.com/Lombiq/Hosting-Media-Theme</RepositoryUrl>
     <PackageProjectUrl>https://github.com/Lombiq/Hosting-Media-Theme</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="" />
     <None Include="build\**" Pack="true" PackagePath="build\" />

diff --git a/Lombiq.Hosting.MediaTheme.Tests.UI/License.md b/Lombiq.Hosting.MediaTheme.Tests.UI/License.md
diff --git a/Lombiq.Hosting.MediaTheme.Tests.UI/Lombiq.Hosting.MediaTheme.Tests.UI.csproj b/Lombiq.Hosting.MediaTheme.Tests.UI/Lombiq.Hosting.MediaTheme.Tests.UI.csproj
@@ -14,12 +14,11 @@
         <PackageTags>OrchardCore;Lombiq;AspNetCore;Media;Theme</PackageTags>
         <RepositoryUrl>https://github.com/Lombiq/Hosting-Media-Theme</RepositoryUrl>
         <PackageProjectUrl>https://github.com/Lombiq/Hosting-Media-Theme/blob/dev/Readme.md</PackageProjectUrl>
-        <PackageLicenseFile>License.md</PackageLicenseFile>
+        <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
     </PropertyGroup>
 
     <ItemGroup>
         <None Remove="node_modules\**" />
-        <None Include="License.md" Pack="true" PackagePath="" />
         <None Include="NuGetIcon.png" Pack="true" PackagePath="" />
     </ItemGroup>
 

diff --git a/Lombiq.Hosting.MediaTheme/License.md b/Lombiq.Hosting.MediaTheme/License.md
diff --git a/Lombiq.Hosting.MediaTheme/Lombiq.Hosting.MediaTheme.csproj b/Lombiq.Hosting.MediaTheme/Lombiq.Hosting.MediaTheme.csproj
@@ -14,12 +14,11 @@
     <PackageTags>OrchardCore;Lombiq;AspNetCore;Media;Theme</PackageTags>
     <RepositoryUrl>https://github.com/Lombiq/Hosting-Media-Theme</RepositoryUrl>
     <PackageProjectUrl>https://github.com/Lombiq/Hosting-Media-Theme</PackageProjectUrl>
-    <PackageLicenseFile>License.md</PackageLicenseFile>
+    <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
   </PropertyGroup>
 
   <ItemGroup>
     <None Remove="node_modules\**" />
-    <None Include="License.md" Pack="true" PackagePath="" />
     <None Include="NuGetIcon.png" Pack="true" PackagePath="" />
   </ItemGroup>