From 5ffcad5ef920731f78873ee9968ebd3e63387dd9 Mon Sep 17 00:00:00 2001
From: Erol Arkat <erol@erolarkat.com>
Date: Thu, 27 Aug 2020 11:31:58 +0300
Subject: [PATCH 1/2] deprecated licenceUrl fix for nuget

---
 LICENSE => LICENSE.md | 0
 common.props          | 7 ++++---
 nupkg/pack.ps1        | 5 ++++-
 3 files changed, 8 insertions(+), 4 deletions(-)
 rename LICENSE => LICENSE.md (100%)

diff --git a/LICENSE b/LICENSE.md
similarity index 100%
rename from LICENSE
rename to LICENSE.md
diff --git a/common.props b/common.props
index 185ff859c9..4855f1cd9c 100644
--- a/common.props
+++ b/common.props
@@ -1,15 +1,16 @@
 <Project>
   <PropertyGroup> 
     <LangVersion>latest</LangVersion> 
-    <Version>3.1.0-rc.2</Version>   
+    <Version>3.1.0</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <PackageIconUrl>https://abp.io/assets/abp_nupkg.png</PackageIconUrl>
-    <PackageProjectUrl>https://abp.io</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/abpframework/abp/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageProjectUrl>https://abp.io/</PackageProjectUrl>
+    <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/abpframework/abp/</RepositoryUrl>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" />
+	<None Include="LICENSE.md" Pack="true" PackagePath=""/>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/nupkg/pack.ps1 b/nupkg/pack.ps1
index 925e697300..8b593dd2a2 100644
--- a/nupkg/pack.ps1
+++ b/nupkg/pack.ps1
@@ -11,6 +11,8 @@ foreach($solution in $solutions) {
 foreach($project in $projects) {
     
     $projectFolder = Join-Path $rootFolder $project
+	
+	Copy-Item (Join-Path $rootFolder "LICENSE.md") -Destination $projectFolder
 
     # Create nuget pack
     Set-Location $projectFolder
@@ -26,7 +28,8 @@ foreach($project in $projects) {
     $projectName = $project.Substring($project.LastIndexOf("/") + 1)
     $projectPackPath = Join-Path $projectFolder ("/bin/Release/" + $projectName + ".*.nupkg")
     Move-Item $projectPackPath $packFolder
-
+	
+	Remove-Item (Join-Path $projectFolder "LICENSE.md")	
 }
 
 # Go back to the pack folder

From 51934a994925f69bb1c2e313eb396dcb52bac44a Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Thu, 27 Aug 2020 11:52:10 +0300
Subject: [PATCH 2/2] feat: add "Clear" to AbpUi localization resource

---
 framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json | 1 +
 framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json
index a4fdf7afbd..d6f24833a9 100644
--- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json
+++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json
@@ -17,6 +17,7 @@
     "Error": "Error",
     "AreYouSure": "Are you sure?",
     "Cancel": "Cancel",
+    "Clear": "Clear",
     "Yes": "Yes",
     "No": "No",
     "Ok": "Ok",
diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json
index bf558bb763..f4fffd3f7f 100644
--- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json
+++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json
@@ -17,6 +17,7 @@
     "Error": "Hata",
     "AreYouSure": "Emin misiniz?",
     "Cancel": "Vazgeç",
+    "Clear": "Temizle",
     "Yes": "Evet",
     "No": "Hayır",
     "Ok": "Tamam",