From 8d9913e36c2cdc67172276fbeb74186500c04c03 Mon Sep 17 00:00:00 2001 From: WonYoung Choi Date: Thu, 31 Aug 2017 18:52:29 +0900 Subject: [PATCH] Revert removing Tizen.GBS.ImportAfter.targets Tizen.GBS.ImportAfter.targets file adds XML documentation to each project build when using %dotnet_build macro Change-Id: I7e1c1209bad53d3da8c10126e9c8f43ae903bc1b --- Tizen.GBS.BuildTasks/Tizen.GBS.ImportAfter.targets | 11 +++++++++++ packaging/dotnet-build-tools.spec | 5 ++++- packaging/macros.dotnet-build-tools | 4 ++-- 3 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 Tizen.GBS.BuildTasks/Tizen.GBS.ImportAfter.targets diff --git a/Tizen.GBS.BuildTasks/Tizen.GBS.ImportAfter.targets b/Tizen.GBS.BuildTasks/Tizen.GBS.ImportAfter.targets new file mode 100644 index 00000000..d8aab8d8 --- /dev/null +++ b/Tizen.GBS.BuildTasks/Tizen.GBS.ImportAfter.targets @@ -0,0 +1,11 @@ + + + + + + $(NoWarn);1591 + $(OutputPath)$(AssemblyName).xml + + + + diff --git a/packaging/dotnet-build-tools.spec b/packaging/dotnet-build-tools.spec index c28b70fa..87fae55e 100644 --- a/packaging/dotnet-build-tools.spec +++ b/packaging/dotnet-build-tools.spec @@ -3,7 +3,7 @@ Name: dotnet-build-tools Summary: Tools for building C# API projects -Version: 1.3.1 +Version: 1.3.2 Release: 1 Group: Development/Libraries License: MIT and Apache-2.0 @@ -64,6 +64,9 @@ mkdir -p %{buildroot}%{CLI_PATH} cp -fr ./dotnet/* %{buildroot}%{CLI_PATH} ln -s %{CLI_PATH}/dotnet %{buildroot}%{_bindir}/dotnet +# Tizen.GBS.BuildTasks +install -p -m 644 Tizen.GBS.BuildTasks/Tizen.GBS.ImportAfter.targets %{buildroot}%{CLI_PATH}/sdk/*/15.0/Microsoft.Common.targets/ImportAfter + # NuGet mkdir -p %{buildroot}%{NUGET_PATH} install -p -m 755 NuGet/* %{buildroot}%{NUGET_PATH} diff --git a/packaging/macros.dotnet-build-tools b/packaging/macros.dotnet-build-tools index 9cd4b95e..6e5cd20f 100644 --- a/packaging/macros.dotnet-build-tools +++ b/packaging/macros.dotnet-build-tools @@ -46,11 +46,11 @@ dotnet-build -s %{-s:%{-s*}}%{!-s:%{_dotnet_nuget_source}} restore %{1} %{?2} %{ %{nil} %dotnet_build(s:) \ -dotnet-build -c %{_dotnet_build_conf} -s %{-s:%{-s*}}%{!-s:%{_dotnet_nuget_source}} build %{1} %{?2} %{?3} %{?4} %{?5} %{?6} \ +dotnet-build -c %{_dotnet_build_conf} -s %{-s:%{-s*}}%{!-s:%{_dotnet_nuget_source}} build %{1} /p:UsingRPMMacro=true %{?2} %{?3} %{?4} %{?5} %{?6} \ %{nil} %dotnet_pack() \ -dotnet-build -c %{_dotnet_build_conf} %{?2:-v %{2}} pack %{1} %{?3} %{?4} %{?5} %{?6} %{?7} \ +dotnet-build -c %{_dotnet_build_conf} %{?2:-v %{2}} pack %{1} /p:UsingRPMMacro=true %{?3} %{?4} %{?5} %{?6} %{?7} \ %{nil} %dotnet_install_assembly() \ -- 2.34.1