From d32e69ff547e5f6090913db88e9231886fec5813 Mon Sep 17 00:00:00 2001
From: WonYoung Choi <wy80.choi@samsung.com>
Date: Thu, 8 Jun 2017 09:43:42 +0900
Subject: [PATCH] Merge packaging information to csproj

Change-Id: Ic7021df9341ce69f4b457bce783985b809b3a45e
Signed-off-by: WonYoung Choi <wy80.choi@samsung.com>
---
 packaging/csapi-phonenumber-utils.spec             |   2 +-
 .../Properties/AssemblyInfo.cs                     |  36 -------
 .../Tizen.PhonenumberUtils.csproj                  | 107 +++++----------------
 .../Tizen.PhonenumberUtils.nuspec                  |  20 ----
 .../Tizen.PhonenumberUtils.project.json            |   9 --
 .../Tizen.PhonenumberUtils.sln                     |  14 +--
 6 files changed, 33 insertions(+), 155 deletions(-)
 delete mode 100755 src/Tizen.PhonenumberUtils/Properties/AssemblyInfo.cs
 delete mode 100644 src/Tizen.PhonenumberUtils/Tizen.PhonenumberUtils.nuspec
 delete mode 100755 src/Tizen.PhonenumberUtils/Tizen.PhonenumberUtils.project.json
 mode change 100755 => 100644 src/Tizen.PhonenumberUtils/Tizen.PhonenumberUtils.sln

diff --git a/packaging/csapi-phonenumber-utils.spec b/packaging/csapi-phonenumber-utils.spec
index bdcc75b..5f29452 100644
--- a/packaging/csapi-phonenumber-utils.spec
+++ b/packaging/csapi-phonenumber-utils.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.PhonenumberUtils/Properties/AssemblyInfo.cs b/src/Tizen.PhonenumberUtils/Properties/AssemblyInfo.cs
deleted file mode 100755
index 916fbda..0000000
--- a/src/Tizen.PhonenumberUtils/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.PhonenumberUtils")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Samsung Electronics")]
-[assembly: AssemblyProduct("Tizen.PhonenumberUtils")]
-[assembly: AssemblyCopyright("Copyright (c) 2016 Samsung Electronics Co., Ltd")]
-[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("6b8ec773-abdf-4e51-8158-71c56ce25bb9")]
-
-// 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.PhonenumberUtils/Tizen.PhonenumberUtils.csproj b/src/Tizen.PhonenumberUtils/Tizen.PhonenumberUtils.csproj
index c11f53c..ac59e15 100644
--- a/src/Tizen.PhonenumberUtils/Tizen.PhonenumberUtils.csproj
+++ b/src/Tizen.PhonenumberUtils/Tizen.PhonenumberUtils.csproj
@@ -1,82 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{6B8EC773-ABDF-4E51-8158-71C56CE25BB9}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Tizen.PhonenumberUtils</RootNamespace>
-    <AssemblyName>Tizen.PhonenumberUtils</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <DefaultLanguage>en-US</DefaultLanguage>
-  </PropertyGroup>
-  <PropertyGroup>
-    <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v1.3</TargetFrameworkVersion>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
-    <NoStdLib>true</NoStdLib>
-    <NoWarn>$(NoWarn);1701</NoWarn>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>Tizen.PhonenumberUtils.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="Tizen.PhonenumberUtils.project.json" />
-    <None Include="Tizen.PhonenumberUtils.snk" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Interop\Interop.Libraries.cs" />
-    <Compile Include="Interop\Interop.PhonenumberUtils.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Tizen.PhonenumberUtils\NamespaceDoc.cs" />
-    <Compile Include="Tizen.PhonenumberUtils\PhonenumberUtilsEnumerations.cs" />
-    <Compile Include="Tizen.PhonenumberUtils\PhonenumberUtilsErrorFactory.cs" />
-    <Compile Include="Tizen.PhonenumberUtils\PhonenumberUtils.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- 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>
-	-->
-  <PropertyGroup>
-    <!-- https://github.com/dotnet/corefxlab/tree/master/samples/NetCoreSample and
-			 https://docs.microsoft.com/en-us/dotnet/articles/core/tutorials/target-dotnetcore-with-msbuild
-		-->
-    <!-- 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).
-		-->
-    <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)</_TargetFrameworkDirectories>
-    <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)</_FullFrameworkReferenceAssemblyPaths>
-    <AutoUnifyAssemblyReferences>true</AutoUnifyAssemblyReferences>
-  </PropertyGroup>
-</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>Provides the PhonenumberUtils APIs 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>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <SignAssembly>True</SignAssembly>
+    <AssemblyOriginatorKeyFile>Tizen.PhonenumberUtils.snk</AssemblyOriginatorKeyFile>
+    <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Tizen" Version="1.0.5" />
+  </ItemGroup>
+  
+</Project>
diff --git a/src/Tizen.PhonenumberUtils/Tizen.PhonenumberUtils.nuspec b/src/Tizen.PhonenumberUtils/Tizen.PhonenumberUtils.nuspec
deleted file mode 100644
index bc7fbd0..0000000
--- a/src/Tizen.PhonenumberUtils/Tizen.PhonenumberUtils.nuspec
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<package>
-  <metadata>
-                <id>Tizen.PhonenumberUtils</id>
-                <version>$version$</version>
-                <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 PhonenumberUtils APIs for Tizen</description>
-    <dependencies>
-      <dependency id="Tizen" version="1.0.3" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="bin/$Configuration$/Tizen.PhonenumberUtils.dll" target="lib/netstandard1.3" />
-  </files>
-</package>
diff --git a/src/Tizen.PhonenumberUtils/Tizen.PhonenumberUtils.project.json b/src/Tizen.PhonenumberUtils/Tizen.PhonenumberUtils.project.json
deleted file mode 100755
index 10349a9..0000000
--- a/src/Tizen.PhonenumberUtils/Tizen.PhonenumberUtils.project.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "dependencies": {
-    "NETStandard.Library": "1.6.0",
-    "Tizen": "1.0.3"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  }
-}
\ No newline at end of file
diff --git a/src/Tizen.PhonenumberUtils/Tizen.PhonenumberUtils.sln b/src/Tizen.PhonenumberUtils/Tizen.PhonenumberUtils.sln
old mode 100755
new mode 100644
index 62d130b..20d9acb
--- a/src/Tizen.PhonenumberUtils/Tizen.PhonenumberUtils.sln
+++ b/src/Tizen.PhonenumberUtils/Tizen.PhonenumberUtils.sln
@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.12
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tizen.PhonenumberUtils", "Tizen.PhonenumberUtils.csproj", "{6B8EC773-ABDF-4E51-8158-71C56CE25BB9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.PhonenumberUtils", "Tizen.PhonenumberUtils.csproj", "{4B62C6F4-2EF9-4630-A3DC-C1B920B7BAC9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,10 +11,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6B8EC773-ABDF-4E51-8158-71C56CE25BB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6B8EC773-ABDF-4E51-8158-71C56CE25BB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6B8EC773-ABDF-4E51-8158-71C56CE25BB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6B8EC773-ABDF-4E51-8158-71C56CE25BB9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4B62C6F4-2EF9-4630-A3DC-C1B920B7BAC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4B62C6F4-2EF9-4630-A3DC-C1B920B7BAC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4B62C6F4-2EF9-4630-A3DC-C1B920B7BAC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4B62C6F4-2EF9-4630-A3DC-C1B920B7BAC9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
-- 
2.7.4