Merge packaging information to csproj

Change-Id: I27f70a0003d6dae4b5ac4378a8b5c2ee298476bc
Signed-off-by: WonYoung Choi <wy80.choi@samsung.com>

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..46619d5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+bin/
+obj/
+*.exe
+*.dll
+*.csproj.user
+*.lock.json
+.vs/

diff --git a/packaging/csapi-contacts-service.spec b/packaging/csapi-contacts-service.spec
index a863eb9..ceb583b 100755 (executable)
--- a/packaging/csapi-contacts-service.spec
+++ b/packaging/csapi-contacts-service.spec
@@ -30,7 +30,7 @@ cp %{SOURCE1} .
 %build
 for ASM in %{Assemblies}; do
 %dotnet_build $ASM
-%dotnet_pack $ASM/$ASM.nuspec %{version}
+%dotnet_pack $ASM
 done
 
 %install

diff --git a/src/Tizen.Pims.Contacts/Properties/AssemblyInfo.cs b/src/Tizen.Pims.Contacts/Properties/AssemblyInfo.cs
deleted file mode 100755 (executable)
index 288b803..0000000
--- a/src/Tizen.Pims.Contacts/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Tizen.Pims.Contacts")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Tizen.Pims.Contacts")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("4096f513-b77a-4319-9406-caf715e01561")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

diff --git a/src/Tizen.Pims.Contacts/Tizen.Pims.Contacts.csproj b/src/Tizen.Pims.Contacts/Tizen.Pims.Contacts.csproj
index a99da93..ff51c60 100644 (file)
--- a/src/Tizen.Pims.Contacts/Tizen.Pims.Contacts.csproj
+++ b/src/Tizen.Pims.Contacts/Tizen.Pims.Contacts.csproj
@@ -1,101 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>8.0.30703</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{4096F513-B77A-4319-9406-CAF715E01561}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>Tizen.Pims.Contacts</RootNamespace>\r
-    <AssemblyName>Tizen.Pims.Contacts</AssemblyName>\r
-    <FileAlignment>512</FileAlignment>\r
-    <DefaultLanguage>en-US</DefaultLanguage>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>\r
-    <TargetFrameworkVersion>v1.3</TargetFrameworkVersion>\r
-    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-    <NoStdLib>true</NoStdLib>\r
-    <NoWarn>$(NoWarn);1701</NoWarn>\r
-    <UseVSHostingProcess>false</UseVSHostingProcess>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <Optimize>false</Optimize>\r
-    <OutputPath>bin\Debug\</OutputPath>\r
-    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <Optimize>true</Optimize>\r
-    <OutputPath>bin\Release\</OutputPath>\r
-    <DefineConstants>TRACE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <None Include="Tizen.Pims.Contacts.project.json" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Compile Include="Tizen.Pims.Contacts\ContactsErrorFactory.cs" />\r
-    <Compile Include="Tizen.Pims.Contacts\ContactsList.cs" />\r
-    <Compile Include="Tizen.Pims.Contacts\ContactsVcard.cs" />\r
-    <Compile Include="Tizen.Pims.Contacts\DBStatusChangedEventArgs.cs" />\r
-    <Compile Include="Tizen.Pims.Contacts\ContactsQuery.cs" />\r
-    <Compile Include="Interop\Interop.Activity.cs" />\r
-    <Compile Include="Interop\Interop.Contacts.cs" />\r
-    <Compile Include="Interop\Interop.Database.cs" />\r
-    <Compile Include="Interop\Interop.Filter.cs" />\r
-    <Compile Include="Interop\Interop.Group.cs" />\r
-    <Compile Include="Interop\Interop.Libraries.cs" />\r
-    <Compile Include="Interop\Interop.List.cs" />\r
-    <Compile Include="Interop\Interop.Person.cs" />\r
-    <Compile Include="Interop\Interop.PhoneLog.cs" />\r
-    <Compile Include="Interop\Interop.Query.cs" />\r
-    <Compile Include="Interop\Interop.Record.cs" />\r
-    <Compile Include="Interop\Interop.Setting.cs" />\r
-    <Compile Include="Interop\Interop.Sim.cs" />\r
-    <Compile Include="Interop\Interop.Vcard.cs" />\r
-    <Compile Include="Properties\AssemblyInfo.cs" />\r
-    <Compile Include="Tizen.Pims.Contacts\ContactsDatabase.cs" />\r
-    <Compile Include="Tizen.Pims.Contacts\ContactsFilter.cs" />\r
-    <Compile Include="Tizen.Pims.Contacts\ContactsManager.cs" />\r
-    <Compile Include="Tizen.Pims.Contacts\ContactsRecord.cs" />\r
-    <Compile Include="Tizen.Pims.Contacts\ContactsViews.cs" />\r
-    <Compile Include="Tizen.Pims.Contacts\NameDisplayOrderChangedEventArgs.cs" />\r
-    <Compile Include="Tizen.Pims.Contacts\NameSortingOrderChangedEventArgs.cs" />\r
-    <Compile Include="Tizen.Pims.Contacts\NamespaceDoc.cs" />\r
-  </ItemGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-               Other similar extension points exist, see Microsoft.Common.targets.
-       <Target Name="BeforeBuild">
-       </Target>
-       <Target Name="AfterBuild">
-       </Target>
-       -->\r
-  <PropertyGroup>\r
-    <!-- https://github.com/dotnet/corefxlab/tree/master/samples/NetCoreSample and
-                        https://docs.microsoft.com/en-us/dotnet/articles/core/tutorials/target-dotnetcore-with-msbuild
-               -->\r
-    <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two
-                        properties to any folder that exists to skip the GetReferenceAssemblyPaths task (not target) and
-                        to prevent it from outputting a warning (MSB3644).
-               -->\r
-    <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)</_TargetFrameworkDirectories>\r
-    <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)</_FullFrameworkReferenceAssemblyPaths>\r
-    <AutoUnifyAssemblyReferences>true</AutoUnifyAssemblyReferences>\r
-  </PropertyGroup>\r
-  <ProjectExtensions>\r
-    <VisualStudio>\r
-      <UserProperties Tizen_1Pims_1Contacts_1project_1json__JSONSchema="" />\r
-    </VisualStudio>\r
-  </ProjectExtensions>\r
-</Project>
\ No newline at end of file
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Version>1.0.0</Version>
+    <Authors>Samsung Electronics</Authors>
+    <Copyright>© Samsung Electronics Co., Ltd All Rights Reserved</Copyright>
+    <Description>Contacts Service API for Tizen .NET</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.6</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Tizen" Version="1.0.5" />
+  </ItemGroup>
+
+</Project>

diff --git a/src/Tizen.Pims.Contacts/Tizen.Pims.Contacts.nuspec b/src/Tizen.Pims.Contacts/Tizen.Pims.Contacts.nuspec
deleted file mode 100755 (executable)
index ca9f811..0000000
--- a/src/Tizen.Pims.Contacts/Tizen.Pims.Contacts.nuspec
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<package>
-       <metadata>
-               <id>Tizen.Pims.Contacts</id>
-               <version>$version$</version>
-               <authors>Tizen Developers</authors>
-               <description>Contacts Service API for Tizen.Net</description>
-               <dependencies>
-                       <dependency id="Tizen" version="1.0.0" />
-               </dependencies>
-       </metadata>
-</package>

diff --git a/src/Tizen.Pims.Contacts/Tizen.Pims.Contacts.project.json b/src/Tizen.Pims.Contacts/Tizen.Pims.Contacts.project.json
deleted file mode 100755 (executable)
index 2f40bac..0000000
--- a/src/Tizen.Pims.Contacts/Tizen.Pims.Contacts.project.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "dependencies": {
-    "NETStandard.Library": "1.6.0",
-    "Tizen": "1.0.2"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  }
-}
\ No newline at end of file

diff --git a/src/Tizen.Pims.Contacts/Tizen.Pims.Contacts.sln b/src/Tizen.Pims.Contacts/Tizen.Pims.Contacts.sln
old mode 100755 (executable)
new mode 100644 (file)
index aabfd07..5019e53
--- a/src/Tizen.Pims.Contacts/Tizen.Pims.Contacts.sln
+++ b/src/Tizen.Pims.Contacts/Tizen.Pims.Contacts.sln
@@ -1,22 +1,22 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tizen.Pims.Contacts", "Tizen.Pims.Contacts.csproj", "{4096F513-B77A-4319-9406-CAF715E01561}"
-EndProject
-Global
-       GlobalSection(SolutionConfigurationPlatforms) = preSolution
-               Debug|Any CPU = Debug|Any CPU
-               Release|Any CPU = Release|Any CPU
-       EndGlobalSection
-       GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {4096F513-B77A-4319-9406-CAF715E01561}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {4096F513-B77A-4319-9406-CAF715E01561}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {4096F513-B77A-4319-9406-CAF715E01561}.Release|Any CPU.ActiveCfg = Release|Any CPU
-               {4096F513-B77A-4319-9406-CAF715E01561}.Release|Any CPU.Build.0 = Release|Any CPU
-       EndGlobalSection
-       GlobalSection(SolutionProperties) = preSolution
-               HideSolutionNode = FALSE
-       EndGlobalSection
-EndGlobal
+\r
+Microsoft Visual Studio Solution File, Format Version 12.00\r
+# Visual Studio 15\r
+VisualStudioVersion = 15.0.26430.12\r
+MinimumVisualStudioVersion = 10.0.40219.1\r
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Pims.Contacts", "Tizen.Pims.Contacts.csproj", "{FCF45377-F8FA-4556-B2F8-ABB676816033}"\r
+EndProject\r
+Global\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug|Any CPU = Debug|Any CPU\r
+               Release|Any CPU = Release|Any CPU\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {FCF45377-F8FA-4556-B2F8-ABB676816033}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {FCF45377-F8FA-4556-B2F8-ABB676816033}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {FCF45377-F8FA-4556-B2F8-ABB676816033}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {FCF45377-F8FA-4556-B2F8-ABB676816033}.Release|Any CPU.Build.0 = Release|Any CPU\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+EndGlobal\r