Use Microsoft.SourceLink.GitHub

Fix #6398 fix #3462
abpframework · Dec 1, 2020 · 2beb90b · 2beb90b
1 parent 1b36843
commit 2beb90b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 46 deletions.
diff --git 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>
diff --git a/modules/cms-kit/common.props b/modules/cms-kit/common.props
diff --git a/modules/identityserver/common.props b/modules/identityserver/common.props
diff --git 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>
diff --git 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>
diff --git 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>