From 2beb90b3e1431a6d7e8c79cc7c67afc24cbbe5d9 Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 1 Dec 2020 17:00:48 +0800 Subject: [PATCH 1/2] 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 @@ git https://github.com/abpframework/abp/ true + + + true + $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb - + + all + runtime; build; native; contentfiles; analyzers + \ 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 @@ - - - latest - 0.1.0 - $(NoWarn);CS1591;CS0436 - module - - - - - - - \ 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 @@ - - - latest - 0.3.0 - $(NoWarn);CS1591;CS0436 - http://www.aspnetboilerplate.com/images/abp_nupkg.png - http://abp.io - git - https://github.com/volosoft/abp/ - - - - - - - \ 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 @@ 0.1.0 $(NoWarn);CS1591;CS0436 - - - - - \ 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 @@ latest 0.1.0 $(NoWarn);CS1591;CS0436 - module + module - - - - - \ 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 @@ 0.1.0 $(NoWarn);CS1591;CS0436 - - - - - \ No newline at end of file From d6601145cfe07f991791037ef214dd2da30d84b1 Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 1 Dec 2020 17:14:31 +0800 Subject: [PATCH 2/2] Remove common.props from cms-kit test&host module. --- .../host/Volo.CmsKit.Host.Shared/Volo.CmsKit.Host.Shared.csproj | 2 -- .../Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.csproj | 2 -- .../host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.csproj | 2 -- .../host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.csproj | 2 -- .../Volo.CmsKit.Application.Tests.csproj | 2 -- .../Volo.CmsKit.Domain.Tests/Volo.CmsKit.Domain.Tests.csproj | 2 -- .../Volo.CmsKit.EntityFrameworkCore.Tests.csproj | 2 -- .../Volo.CmsKit.MongoDB.Tests/Volo.CmsKit.MongoDB.Tests.csproj | 2 -- .../test/Volo.CmsKit.TestBase/Volo.CmsKit.TestBase.csproj | 2 -- 9 files changed, 18 deletions(-) diff --git a/modules/cms-kit/host/Volo.CmsKit.Host.Shared/Volo.CmsKit.Host.Shared.csproj b/modules/cms-kit/host/Volo.CmsKit.Host.Shared/Volo.CmsKit.Host.Shared.csproj index c6a4484865..aca54af174 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Host.Shared/Volo.CmsKit.Host.Shared.csproj +++ b/modules/cms-kit/host/Volo.CmsKit.Host.Shared/Volo.CmsKit.Host.Shared.csproj @@ -1,7 +1,5 @@ - - netstandard2.0 Volo.CmsKit diff --git a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.csproj b/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.csproj index d019896648..11f3fdac2a 100644 --- a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.csproj +++ b/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.csproj @@ -1,7 +1,5 @@ - - net5.0 Volo.CmsKit diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.csproj b/modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.csproj index 23a4b9fae3..e760c0c6bf 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.csproj +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.csproj @@ -1,7 +1,5 @@ - - net5.0 Volo.CmsKit diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.csproj b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.csproj index 70f6923cfc..9ae996d869 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.csproj +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.csproj @@ -1,7 +1,5 @@ - - net5.0 Volo.CmsKit diff --git a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Volo.CmsKit.Application.Tests.csproj b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Volo.CmsKit.Application.Tests.csproj index 9093a9e11c..26c4be533f 100644 --- a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Volo.CmsKit.Application.Tests.csproj +++ b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Volo.CmsKit.Application.Tests.csproj @@ -1,7 +1,5 @@ - - net5.0 Volo.CmsKit diff --git a/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Volo.CmsKit.Domain.Tests.csproj b/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Volo.CmsKit.Domain.Tests.csproj index 405fa79568..d80255ba61 100644 --- a/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Volo.CmsKit.Domain.Tests.csproj +++ b/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Volo.CmsKit.Domain.Tests.csproj @@ -1,7 +1,5 @@ - - net5.0 Volo.CmsKit diff --git a/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/Volo.CmsKit.EntityFrameworkCore.Tests.csproj b/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/Volo.CmsKit.EntityFrameworkCore.Tests.csproj index e639191049..b7033afe20 100644 --- a/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/Volo.CmsKit.EntityFrameworkCore.Tests.csproj +++ b/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/Volo.CmsKit.EntityFrameworkCore.Tests.csproj @@ -1,7 +1,5 @@ - - net5.0 Volo.CmsKit diff --git a/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/Volo.CmsKit.MongoDB.Tests.csproj b/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/Volo.CmsKit.MongoDB.Tests.csproj index d21c219bab..9591191e60 100644 --- a/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/Volo.CmsKit.MongoDB.Tests.csproj +++ b/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/Volo.CmsKit.MongoDB.Tests.csproj @@ -1,7 +1,5 @@ - - net5.0 Volo.CmsKit diff --git a/modules/cms-kit/test/Volo.CmsKit.TestBase/Volo.CmsKit.TestBase.csproj b/modules/cms-kit/test/Volo.CmsKit.TestBase/Volo.CmsKit.TestBase.csproj index 89d35f3aa9..35c8c151ea 100644 --- a/modules/cms-kit/test/Volo.CmsKit.TestBase/Volo.CmsKit.TestBase.csproj +++ b/modules/cms-kit/test/Volo.CmsKit.TestBase/Volo.CmsKit.TestBase.csproj @@ -1,7 +1,5 @@ - - net5.0 Volo.CmsKit