From 7ac317c58897b76c8212f9b2af25198dc8d0d238 Mon Sep 17 00:00:00 2001
From: Magnus Rahl <magnus.rahl@episerver.com>
Date: Thu, 4 May 2023 12:06:04 +0200
Subject: [PATCH] Align package license

The repo is apache licensed but the built nuget package did not reflect
this. This commit aligns the licenses. Needed to add a reference to the
build/public.props file to make it build correctly locally to verify.
---
 Directory.Build.props                      |  1 +
 Directory.Build.targets                    |  1 -
 build/license.targets                      | 24 ----------------------
 build/licenses/LICENSE.txt.template        | 10 ---------
 build/licenses/NO-THIRD-PARTY-LICENSES.txt |  1 -
 build/public.props                         |  6 ++----
 6 files changed, 3 insertions(+), 40 deletions(-)
 delete mode 100644 build/license.targets
 delete mode 100644 build/licenses/LICENSE.txt.template
 delete mode 100644 build/licenses/NO-THIRD-PARTY-LICENSES.txt

diff --git a/Directory.Build.props b/Directory.Build.props
index 5b74807..496a569 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,5 +1,6 @@
 <Project>
   <Import Project="build\version.props" />
+  <Import Project="build\public.props" />
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 655ffc1..cb36d0f 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,6 +1,5 @@
 <Project>
   <Import Project="build\dependencies.props" />
-  <Import Project="$(BuildDirectory)license.targets" />
 
   <!-- Workaround for SourceLink issues - https://github.com/dotnet/sourcelink/issues/572 -->
   <PropertyGroup>
diff --git a/build/license.targets b/build/license.targets
deleted file mode 100644
index ae7cd8b..0000000
--- a/build/license.targets
+++ /dev/null
@@ -1,24 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);IncludeLicenseFile</TargetsForTfmSpecificContentInPackage>
-    <IntermediateLicenseFile>$(BaseIntermediateOutputPath)$(PackageLicenseFile)</IntermediateLicenseFile>
-  </PropertyGroup>
-
-  <Target Name="GenerateLicenseFile" Inputs="$(LicenseTemplate);$(LicenseFiles)" Outputs="$(IntermediateLicenseFile)">
-    <ItemGroup>
-      <LicenseFiles Include="$(LicenseTemplate)" Condition="'$(LicenseTemplate)' != ''" />
-      <LicenseFiles Include="$(LicenseFiles)" Condition="'$(LicenseFiles)' != ''"/>
-      <LicenseContents Include="$([System.IO.File]::ReadAllText(%(LicenseFiles.Identity)))" Condition="'$(LicenseFiles)' != ''"/>
-    </ItemGroup>
-    <Message Text="Updating package license file..." Importance="high" />
-    <WriteLinesToFile File="$(IntermediateLicenseFile)" Lines="@(LicenseContents->'%(Identity)%0D%0A')" Overwrite="true" />
-  </Target>
-
-  <Target Name="IncludeLicenseFile" DependsOnTargets="GenerateLicenseFile" Condition=" '$(PackageLicenseFile)' != '' ">
-    <ItemGroup>
-      <TfmSpecificPackageFile Include="$(IntermediateLicenseFile)" PackagePath="" />
-    </ItemGroup>
-  </Target>
-
-</Project>
diff --git a/build/licenses/LICENSE.txt.template b/build/licenses/LICENSE.txt.template
deleted file mode 100644
index b36bb8c..0000000
--- a/build/licenses/LICENSE.txt.template
+++ /dev/null
@@ -1,10 +0,0 @@
-EPISERVER T/A OPTIMIZELY SOFTWARE LICENSE
-
-SOFTWARE LICENSE
-Refer to the Episerver t/a Optimizely End User License Agreement:
-https://www.optimizely.com/eula.
-
-IMPLEMENTED SOFTWARE
-Implemented Software, as defined by the Episerver t/a Optimizely End User
-License Agreement (https://www.optimizely.com/eula), used in this Nuget package
-is listed below together with the corresponding license.
diff --git a/build/licenses/NO-THIRD-PARTY-LICENSES.txt b/build/licenses/NO-THIRD-PARTY-LICENSES.txt
deleted file mode 100644
index 248d7db..0000000
--- a/build/licenses/NO-THIRD-PARTY-LICENSES.txt
+++ /dev/null
@@ -1 +0,0 @@
-No additional Implemented Software is included in this package.
\ No newline at end of file
diff --git a/build/public.props b/build/public.props
index e3ce3ec..8450338 100644
--- a/build/public.props
+++ b/build/public.props
@@ -8,7 +8,7 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <PackageOutputPath>$(ArtifactsDirectory)packages\</PackageOutputPath>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <PackageTags>EPiServer MassTransit Events</PackageTags>
+    <PackageTags>EPiServer Lucene Search</PackageTags>
     <Copyright>Copyright Optimizely $([System.DateTime]::Now.ToString(yyyy))</Copyright>
     <Authors>Optimizely</Authors>
     <PackageIcon>icon.png</PackageIcon>
@@ -17,9 +17,7 @@
     <RepositoryUrl>https://github.com/episerver/content-search-lucene.git</RepositoryUrl>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageLicenseFile>license.txt</PackageLicenseFile>
-    <LicenseFiles>$(BuildDirectory)licenses\NO-THIRD-PARTY-LICENSES.txt</LicenseFiles>
-    <LicenseTemplate>$(BuildDirectory)licenses\LICENSE.txt.template</LicenseTemplate>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
   </PropertyGroup>
 
   <ItemGroup>