crobibero 4 роки тому
батько
коміт
5f60da29c7

+ 1 - 11
Emby.Naming/Emby.Naming.csproj

@@ -25,19 +25,9 @@
     <PackageId>Jellyfin.Naming</PackageId>
     <VersionPrefix>10.7.0</VersionPrefix>
     <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
+    <PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="../LICENSE.txt">
-      <PackagePath>LICENSE.txt</PackagePath>
-      <Pack>true</Pack>
-    </None>
-  </ItemGroup>
-
   <!-- Code Analyzers-->
   <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
     <!-- TODO: <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" /> -->

+ 1 - 11
Jellyfin.Data/Jellyfin.Data.csproj

@@ -12,19 +12,9 @@
     <PackageId>Jellyfin.Data</PackageId>
     <VersionPrefix>10.7.0</VersionPrefix>
     <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
+    <PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="../LICENSE.txt">
-      <PackagePath>LICENSE.txt</PackagePath>
-      <Pack>true</Pack>
-    </None>
-  </ItemGroup>
-
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <CodeAnalysisRuleSet>../jellyfin.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>

+ 1 - 11
MediaBrowser.Common/MediaBrowser.Common.csproj

@@ -10,19 +10,9 @@
     <PackageId>Jellyfin.Common</PackageId>
     <VersionPrefix>10.7.0</VersionPrefix>
     <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
+    <PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="../LICENSE.txt">
-      <PackagePath>LICENSE.txt</PackagePath>
-      <Pack>true</Pack>
-    </None>
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
   </ItemGroup>

+ 1 - 11
MediaBrowser.Controller/MediaBrowser.Controller.csproj

@@ -10,19 +10,9 @@
     <PackageId>Jellyfin.Controller</PackageId>
     <VersionPrefix>10.7.0</VersionPrefix>
     <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
+    <PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="../LICENSE.txt">
-      <PackagePath>LICENSE.txt</PackagePath>
-      <Pack>true</Pack>
-    </None>
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.6" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.6" />

+ 1 - 11
MediaBrowser.Model/MediaBrowser.Model.csproj

@@ -10,19 +10,9 @@
     <PackageId>Jellyfin.Model</PackageId>
     <VersionPrefix>10.7.0</VersionPrefix>
     <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
+    <PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="../LICENSE.txt">
-      <PackagePath>LICENSE.txt</PackagePath>
-      <Pack>true</Pack>
-    </None>
-  </ItemGroup>
-
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>