From: WonYoung Choi <wy80.choi@samsung.com>
Date: Tue, 18 Jul 2017 04:10:24 +0000 (+0900)
Subject: Make symbol nuget package when use dotnet-cli
X-Git-Tag: submit/tizen/20170720.223242~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=530fd3cae94780c3a362efc3faf9b18c7b8f1d75;p=platform%2Fcore%2Fdotnet%2Fbuild-tools.git

Make symbol nuget package when use dotnet-cli

Change-Id: I10db4fef70fc30032fd4fdfa25f286ed1199e144
---

diff --git a/Tizen.GBS.BuildTasks/Tizen.GBS.ImportAfter.targets b/Tizen.GBS.BuildTasks/Tizen.GBS.ImportAfter.targets
index be4fc945..c22e8960 100644
--- a/Tizen.GBS.BuildTasks/Tizen.GBS.ImportAfter.targets
+++ b/Tizen.GBS.BuildTasks/Tizen.GBS.ImportAfter.targets
@@ -1,55 +1,14 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <!-- UseTizenGBSImportAfterTarget -->
-  <PropertyGroup Condition="'$(UseTizenGBSImportAfterTarget)' == ''">
-    <UseTizenGBSImportAfterTarget>false</UseTizenGBSImportAfterTarget>
-    <UseTizenGBSImportAfterTarget Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Tizen'">true</UseTizenGBSImportAfterTarget>
-  </PropertyGroup>
-
-  <!-- TargetFramework -->
-  <PropertyGroup Condition="'$(TargetFramework)' == ''">
-    <_ShortTargetFrameworkIdentifier Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'">netstandard</_ShortTargetFrameworkIdentifier>
-    <_ShortTargetFrameworkIdentifier Condition="'$(TargetFrameworkIdentifier)' == 'Tizen'">tizen</_ShortTargetFrameworkIdentifier>
-    <_TargetFrameworkVersionWithoutV Condition="$(TargetFrameworkVersion.StartsWith('v'))">$(TargetFrameworkVersion.Substring(1))</_TargetFrameworkVersionWithoutV>
-    <TargetFramework Condition="'$(_ShortTargetFrameworkIdentifier)' != ''">$(_ShortTargetFrameworkIdentifier)$(_TargetFrameworkVersionWithoutV)</TargetFramework>
-  </PropertyGroup>
 
   <!-- Suppress missing XML comment warning -->
   <PropertyGroup>
     <NoWarn>$(NoWarn);1591</NoWarn>
   </PropertyGroup>
 
-  <!-- Modify BuildDependsOn -->
-  <PropertyGroup Condition="'$(UseTizenGBSImportAfterTarget)' == 'true'">
-    <BuildDependsOn>
-      $(BuildDependsOn);
-      __AppendNuGetAssemblyFiles;
-    </BuildDependsOn>
-  </PropertyGroup>
-
   <!-- DocumentationFile -->
-  <PropertyGroup Condition="'$(UseTizenGBSImportAfterTarget)' == 'true'">
-    <DocumentationFile Condition="'$(DocumentationFile)' == ''">$(OutputPath)$(AssemblyName).xml</DocumentationFile>
-  </PropertyGroup>
-
-  <!-- NuSpec File -->
   <PropertyGroup>
-    <__NuSpecFile>$(MSBuildProjectDirectory)/$(AssemblyName).nuspec</__NuSpecFile>
+    <DocumentationFile Condition="'$(DocumentationFile)' == ''">$(OutputPath)$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>
 
-  <!-- Additional files to append to .nuspec -->
-  <ItemGroup>
-    <NuGetAssemblyFile Include="$(DocumentationFile)">
-      <TargetPath>lib/$(TargetFramework)</TargetPath>
-    </NuGetAssemblyFile>
-    <NuGetAssemblyFile Include="$(OutputPath)$(TargetFileName)">
-      <TargetPath>lib/$(TargetFramework)</TargetPath>
-    </NuGetAssemblyFile>
-  </ItemGroup>
-
-  <!-- Append _NuGetFiles to .nuspec file -->
-  <Target Name="__AppendNuGetAssemblyFiles" Condition="Exists('$(__NuSpecFile)')">
-    <Exec Command="dotnet-build nuspec_addfile &quot;$(__NuSpecFile)&quot; &quot;%(NuGetAssemblyFile.Identity)&quot; &quot;%(NuGetAssemblyFile.TargetPath)&quot;" />
-  </Target>
-
 </Project>
diff --git a/Tools/dotnet-build.sh b/Tools/dotnet-build.sh
index bd967b4d..c8ade713 100755
--- a/Tools/dotnet-build.sh
+++ b/Tools/dotnet-build.sh
@@ -121,7 +121,7 @@ cmd_pack() {
   if $USE_DOTNET_CLI; then
     [ -n "$CONFIGURATION" ] && OPTS="$OPTS -c $CONFIGURATION"
     [ -n "$VERSION" ] && OPTS="$OPTS /p:Version=$VERSION"
-    run_dotnet pack --no-restore $PROJECT $OPTS $@
+    run_dotnet pack --no-restore --include-symbols $PROJECT $OPTS $@
   else
     local NUSPEC=($PROJECT)
     if [ -d $PROJECT ]; then
diff --git a/packaging/dotnet-build-tools.spec b/packaging/dotnet-build-tools.spec
index b3ce37e7..6387c433 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.2.8
+Version:    1.3.0
 Release:    1
 Group:      Development/Libraries
 License:    MIT and Apache-2.0