From 2beb90b3e1431a6d7e8c79cc7c67afc24cbbe5d9 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Tue, 1 Dec 2020 17:00:48 +0800
Subject: [PATCH] Use Microsoft.SourceLink.GitHub

Fix #6398 fix #3462
---
 common.props                              |  9 ++++++++-
 modules/cms-kit/common.props              | 13 -------------
 modules/identityserver/common.props       | 16 ----------------
 templates/console/common.props            |  5 -----
 templates/module/aspnet-core/common.props |  7 +------
 templates/wpf/common.props                |  5 -----
 6 files changed, 9 insertions(+), 46 deletions(-)
 delete mode 100644 modules/cms-kit/common.props
 delete mode 100644 modules/identityserver/common.props

diff --git a/common.props b/common.props
index 1528abbcc6..1e69d68aa2 100644
--- a/common.props
+++ b/common.props
@@ -9,8 +9,15 @@
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/abpframework/abp/</RepositoryUrl>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+
+    <!-- https://github.com/dotnet/sourcelink -->
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-20204-02">
+        <PrivateAssets>all</PrivateAssets>
+        <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/modules/cms-kit/common.props b/modules/cms-kit/common.props
deleted file mode 100644
index 420d9c492c..0000000000
--- a/modules/cms-kit/common.props
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <LangVersion>latest</LangVersion>
-    <Version>0.1.0</Version>
-    <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
-	<AbpProjectType>module</AbpProjectType>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/modules/identityserver/common.props b/modules/identityserver/common.props
deleted file mode 100644
index 7f5a705307..0000000000
--- a/modules/identityserver/common.props
+++ /dev/null
@@ -1,16 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <LangVersion>latest</LangVersion>
-    <Version>0.3.0</Version>
-    <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
-    <PackageIconUrl>http://www.aspnetboilerplate.com/images/abp_nupkg.png</PackageIconUrl>
-    <PackageProjectUrl>http://abp.io</PackageProjectUrl>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/volosoft/abp/</RepositoryUrl>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/templates/console/common.props b/templates/console/common.props
index 233f41c1ba..7e29afcfb8 100644
--- a/templates/console/common.props
+++ b/templates/console/common.props
@@ -4,9 +4,4 @@
     <Version>0.1.0</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
   </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" />
-  </ItemGroup>
-
 </Project>
\ No newline at end of file
diff --git a/templates/module/aspnet-core/common.props b/templates/module/aspnet-core/common.props
index 420d9c492c..c1ff420edf 100644
--- a/templates/module/aspnet-core/common.props
+++ b/templates/module/aspnet-core/common.props
@@ -3,11 +3,6 @@
     <LangVersion>latest</LangVersion>
     <Version>0.1.0</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
-	<AbpProjectType>module</AbpProjectType>
+    <AbpProjectType>module</AbpProjectType>
   </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" />
-  </ItemGroup>
-
 </Project>
\ No newline at end of file
diff --git a/templates/wpf/common.props b/templates/wpf/common.props
index 233f41c1ba..7e29afcfb8 100644
--- a/templates/wpf/common.props
+++ b/templates/wpf/common.props
@@ -4,9 +4,4 @@
     <Version>0.1.0</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
   </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" />
-  </ItemGroup>
-
 </Project>
\ No newline at end of file