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

Change-Id: I37dc06b28110f3c3696d5b56ca88d8a20e35c1c0
Signed-off-by: WonYoung Choi <wy80.choi@samsung.com>
---
 packaging/csapi-push.spec                          |   4 +-
 .../Properties/AssemblyInfo.cs                     |  52 ----------
 .../Tizen.Messaging.Push.csproj                    | 109 +++++----------------
 .../Tizen.Messaging.Push.nuspec                    |  20 ----
 .../Tizen.Messaging.Push.project.json              |   9 --
 src/Tizen.Messaging.Push/Tizen.Messaging.Push.sln  |  22 +++++
 6 files changed, 49 insertions(+), 167 deletions(-)
 delete mode 100644 src/Tizen.Messaging.Push/Properties/AssemblyInfo.cs
 delete mode 100644 src/Tizen.Messaging.Push/Tizen.Messaging.Push.nuspec
 delete mode 100644 src/Tizen.Messaging.Push/Tizen.Messaging.Push.project.json
 create mode 100644 src/Tizen.Messaging.Push/Tizen.Messaging.Push.sln

diff --git a/packaging/csapi-push.spec b/packaging/csapi-push.spec
index 6f6ee46..4542ebe 100644
--- a/packaging/csapi-push.spec
+++ b/packaging/csapi-push.spec
@@ -1,6 +1,6 @@
 Name:       csapi-push
 Summary:    Tizen Push API for C#
-Version:    1.0.4
+Version:    1.0.5
 Release:    1
 Group:      Development/Libraries
 License:    Apache-2.0
@@ -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.Messaging.Push/Properties/AssemblyInfo.cs b/src/Tizen.Messaging.Push/Properties/AssemblyInfo.cs
deleted file mode 100644
index 2062b61..0000000
--- a/src/Tizen.Messaging.Push/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,52 +0,0 @@
- /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-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.Messaging")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Tizen.Messaging")]
-[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("4f3ffd8c-4a03-4bc1-83d4-358b0eb6717c")]
-
-// 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.Messaging.Push/Tizen.Messaging.Push.csproj b/src/Tizen.Messaging.Push/Tizen.Messaging.Push.csproj
index 43860e7..263c6b7 100644
--- a/src/Tizen.Messaging.Push/Tizen.Messaging.Push.csproj
+++ b/src/Tizen.Messaging.Push/Tizen.Messaging.Push.csproj
@@ -1,84 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{2EC5CFA1-06D5-4E84-81EC-D3A57B24B6BD}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Tizen.Messaging</RootNamespace>
-    <AssemblyName>Tizen.Messaging.Push</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup>
-    <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v1.3</TargetFrameworkVersion>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
-    <NoStdLib>true</NoStdLib>
-    <NoWarn>$(NoWarn);1701;1702</NoWarn>
-  </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>
-    <Prefer32Bit>false</Prefer32Bit>
-  </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>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>Tizen.Messaging.Push.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Interop\Interop.Glib.cs" />
-    <Compile Include="Interop\Interop.Libc.cs" />
-    <Compile Include="Interop\Interop.Libraries.cs" />
-    <Compile Include="Interop\Interop.PushClient.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Tizen.Messaging.Push\PushClient.cs" />
-    <Compile Include="Tizen.Messaging.Push\PushConnectionStateEventArgs.cs" />
-    <Compile Include="Tizen.Messaging.Push\PushExceptionFactory.cs" />
-    <Compile Include="Tizen.Messaging.Push\PushImpl.cs" />
-    <Compile Include="Tizen.Messaging.Push\PushMessageEventArgs.cs" />
-    <Compile Include="Tizen.Messaging.Push\ServerResponse.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Tizen.Messaging.Push.nuspec" />
-    <None Include="Tizen.Messaging.Push.project.json" />
-    <None Include="Tizen.Messaging.Push.snk" />
-  </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>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Version>1.0.5</Version>
+    <Authors>Samsung Electronics</Authors>
+    <Copyright>© Samsung Electronics Co., Ltd All Rights Reserved</Copyright>
+    <Description>Push 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>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <SignAssembly>True</SignAssembly>
+    <AssemblyOriginatorKeyFile>Tizen.Messaging.Push.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.Messaging.Push/Tizen.Messaging.Push.nuspec b/src/Tizen.Messaging.Push/Tizen.Messaging.Push.nuspec
deleted file mode 100644
index af656da..0000000
--- a/src/Tizen.Messaging.Push/Tizen.Messaging.Push.nuspec
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<package>
-  <metadata>
-    <id>Tizen.Messaging.Push</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>Push API for Tizen.Net</description>
-    <dependencies>
-      <dependency id="Tizen" version="1.0.1" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="bin/$Configuration$/Tizen.Messaging.Push.dll" target="lib/netstandard1.3" />
-  </files>
-</package>
diff --git a/src/Tizen.Messaging.Push/Tizen.Messaging.Push.project.json b/src/Tizen.Messaging.Push/Tizen.Messaging.Push.project.json
deleted file mode 100644
index db7436c..0000000
--- a/src/Tizen.Messaging.Push/Tizen.Messaging.Push.project.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "dependencies": {
-    "NETStandard.Library": "1.6.0",
-    "Tizen": "1.0.1"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  }
-}
diff --git a/src/Tizen.Messaging.Push/Tizen.Messaging.Push.sln b/src/Tizen.Messaging.Push/Tizen.Messaging.Push.sln
new file mode 100644
index 0000000..fda27bb
--- /dev/null
+++ b/src/Tizen.Messaging.Push/Tizen.Messaging.Push.sln
@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.12
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Messaging.Push", "Tizen.Messaging.Push.csproj", "{2D5F58C4-AD0D-471B-8C61-00ACC9D6BA51}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2D5F58C4-AD0D-471B-8C61-00ACC9D6BA51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D5F58C4-AD0D-471B-8C61-00ACC9D6BA51}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D5F58C4-AD0D-471B-8C61-00ACC9D6BA51}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2D5F58C4-AD0D-471B-8C61-00ACC9D6BA51}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
-- 
2.7.4