Merge branch 'rel-3.1' into dev

common.props

@@ -4,12 +4,13 @@
     <Version>3.1.0</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <PackageIconUrl>https://abp.io/assets/abp_nupkg.png</PackageIconUrl>
-    <PackageProjectUrl>https://abp.io</PackageProjectUrl>
+    <PackageProjectUrl>https://abp.io/</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/abpframework/abp/blob/master/LICENSE</PackageLicenseUrl>
+    <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>

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",

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",

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