Merge "Fix the doxygen error which was caused by using #" into tizen

diff --git a/Tizen/Tizen.csproj b/Tizen/Tizen.csproj
index cd26fb1..42dd3c3 100644 (file)
--- a/Tizen/Tizen.csproj
+++ b/Tizen/Tizen.csproj
@@ -1,11 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <Title>Tizen Base Library</Title>
+    <Version>1.0.5</Version>
+    <Authors>Samsung Electronics</Authors>
+    <Copyright>© Samsung Electronics Co., Ltd All Rights Reserved</Copyright>
+    <Description>Provides the basic structures and classes that are used in the other Tizen Device API.</Description>
+    <PackageProjectUrl>https://www.tizen.org/</PackageProjectUrl>
+    <PackageLicenseUrl>https://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
+    <PackageIconUrl>https://developer.tizen.org/sites/default/files/images/tizen-pinwheel-on-light-rgb_64_64.png</PackageIconUrl>
+  </PropertyGroup>
+
+  <PropertyGroup>
     <TargetFramework>netstandard1.3</TargetFramework>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>Tizen.snk</AssemblyOriginatorKeyFile>
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
-    <GenerateReferenceAssembly>True</GenerateReferenceAssembly>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Tizen/Tizen.nuspec b/Tizen/Tizen.nuspec
deleted file mode 100644 (file)
index 0fa64b4..0000000
--- a/Tizen/Tizen.nuspec
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package>
-  <metadata>
-    <id>Tizen</id>
-    <version>$version$</version>
-    <title>Tizen Base Library</title>
-    <authors>Samsung Electronics</authors>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <licenseUrl>https://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
-    <projectUrl>https://www.tizen.org/</projectUrl>
-    <iconUrl>https://developer.tizen.org/sites/default/files/images/tizen-pinwheel-on-light-rgb_64_64.png</iconUrl>
-    <copyright>© Samsung Electronics Co., Ltd All Rights Reserved</copyright>
-    <description>Provides the basic structures and classes that are used in the other Tizen Device API.</description>
-    <dependencies>
-      <dependency id="Tizen.Log" version="1.0.0" />
-    </dependencies>
-  </metadata>
-</package>

diff --git a/packaging/csapi-tizen.spec b/packaging/csapi-tizen.spec
index 2ffb358..3486f07 100644 (file)
--- a/packaging/csapi-tizen.spec
+++ b/packaging/csapi-tizen.spec
@@ -36,7 +36,7 @@ cp %{SOURCE1} .
 %build
 for ASM in %{Assemblies}; do
 %dotnet_build $ASM
-%dotnet_pack $ASM/$ASM.nuspec %{version}
+%dotnet_pack $ASM
 done
 
 %install