Merge packaging information to csproj

Change-Id: I621633d862f274f74ce9a753c479b35e8da670be
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/Tizen.Network.Nsd/Properties/AssemblyInfo.cs b/Tizen.Network.Nsd/Properties/AssemblyInfo.cs
deleted file mode 100755 (executable)
index a54bf07..0000000
--- a/Tizen.Network.Nsd/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;\r
-using System.Runtime.CompilerServices;\r
-using System.Runtime.InteropServices;\r
-\r
-// General Information about an assembly is controlled through the following\r
-// set of attributes. Change these attribute values to modify the information\r
-// associated with an assembly.\r
-[assembly: AssemblyTitle("Tizen.Network.Nsd")]\r
-[assembly: AssemblyDescription("")]\r
-[assembly: AssemblyConfiguration("")]\r
-[assembly: AssemblyCompany("Samsung Electronics")]\r
-[assembly: AssemblyProduct("Tizen.Network.Nsd")]\r
-[assembly: AssemblyCopyright("Copyright © Samsung Electronics 2016")]\r
-[assembly: AssemblyTrademark("")]\r
-[assembly: AssemblyCulture("")]\r
-\r
-// Setting ComVisible to false makes the types in this assembly not visible\r
-// to COM components.  If you need to access a type in this assembly from\r
-// COM, set the ComVisible attribute to true on that type.\r
-[assembly: ComVisible(false)]\r
-\r
-// The following GUID is for the ID of the typelib if this project is exposed to COM\r
-[assembly: Guid("08c34d73-7986-4e6e-8c21-5343c7feec86")]\r
-\r
-// Version information for an assembly consists of the following four values:\r
-//\r
-//      Major Version\r
-//      Minor Version\r
-//      Build Number\r
-//      Revision\r
-//\r
-// You can specify all the values or you can default the Build and Revision Numbers\r
-// by using the '*' as shown below:\r
-// [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("1.0.0.0")]\r
-[assembly: AssemblyFileVersion("1.0.0.0")]\r

diff --git a/Tizen.Network.Nsd/Tizen.Network.Nsd.csproj b/Tizen.Network.Nsd/Tizen.Network.Nsd.csproj
old mode 100755 (executable)
new mode 100644 (file)
index 8a1849d..1a688ce
--- a/Tizen.Network.Nsd/Tizen.Network.Nsd.csproj
+++ b/Tizen.Network.Nsd/Tizen.Network.Nsd.csproj
@@ -1,84 +1,25 @@
-<?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
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProjectGuid>{08C34D73-7986-4E6E-8C21-5343C7FEEC86}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>Tizen.Network.Nsd</RootNamespace>\r
-    <AssemblyName>Tizen.Network.Nsd</AssemblyName>\r
-    <FileAlignment>512</FileAlignment>\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;1702</NoWarn>\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
-  <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>Tizen.Network.Nsd.snk</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Compile Include="Interop\Interop.Libraries.cs" />\r
-    <Compile Include="Interop\Interop.Nsd.cs" />\r
-    <Compile Include="Properties\AssemblyInfo.cs" />\r
-    <Compile Include="Tizen.Network.Nsd\NsdEnumerations.cs" />\r
-    <Compile Include="Tizen.Network.Nsd\INsdService.cs" />\r
-    <Compile Include="Tizen.Network.Nsd\INsdBrowser.cs" />\r
-    <Compile Include="Tizen.Network.Nsd\DnssdService.cs" />\r
-    <Compile Include="Tizen.Network.Nsd\NsdError.cs" />\r
-    <Compile Include="Tizen.Network.Nsd\SsdpService.cs" />\r
-    <Compile Include="Tizen.Network.Nsd\DnssdBrowser.cs" />\r
-    <Compile Include="Tizen.Network.Nsd\SsdpBrowser.cs" />\r
-    <Compile Include="Tizen.Network.Nsd\NsdEventArgs.cs" />\r
-    <Compile Include="Tizen.Network.Nsd\NsdManager.cs" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <None Include="Tizen.Network.Nsd.nuspec" />\r
-    <None Include="Tizen.Network.Nsd.project.json" />\r
-    <None Include="Tizen.Network.Nsd.snk" />\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
-</Project>
\ No newline at end of file
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Version>1.0.1</Version>
+    <Authors>Samsung Electronics</Authors>
+    <Copyright>© Samsung Electronics Co., Ltd All Rights Reserved</Copyright>
+    <Description>Provides the DNSSD and SSDP 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.3</TargetFramework>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <SignAssembly>True</SignAssembly>
+    <AssemblyOriginatorKeyFile>Tizen.Network.Nsd.snk</AssemblyOriginatorKeyFile>
+    <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Tizen" Version="1.0.5" />
+  </ItemGroup>
+  
+</Project>

diff --git a/Tizen.Network.Nsd/Tizen.Network.Nsd.nuspec b/Tizen.Network.Nsd/Tizen.Network.Nsd.nuspec
deleted file mode 100755 (executable)
index a97a953..0000000
--- a/Tizen.Network.Nsd/Tizen.Network.Nsd.nuspec
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<package>
-       <metadata>
-               <id>Tizen.Network.Nsd</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 DNSSD and SSDP APIs for Tizen.Network.Nsd</description>
-               <dependencies>
-                       <dependency id="Tizen" version="1.0.2" />
-               </dependencies>
-       </metadata>
-       <files>
-               <file src="bin/$Configuration$/Tizen.Network.Nsd.dll" target="lib/netstandard1.3" />
-       </files>
-</package>

diff --git a/Tizen.Network.Nsd/Tizen.Network.Nsd.project.json b/Tizen.Network.Nsd/Tizen.Network.Nsd.project.json
deleted file mode 100755 (executable)
index f463d9b..0000000
--- a/Tizen.Network.Nsd/Tizen.Network.Nsd.project.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{\r
-  "dependencies": {\r
-    "NETStandard.Library": "1.6.0",\r
-    "System.Threading.Thread": "4.3.0",\r
-    "Tizen": "1.0.2"\r
-  },\r
-  "frameworks": {\r
-    "netstandard1.3": {}\r
-  }\r
-}\r

diff --git a/Tizen.Network.Nsd/Tizen.Network.Nsd.sln b/Tizen.Network.Nsd/Tizen.Network.Nsd.sln
old mode 100755 (executable)
new mode 100644 (file)
index f229e7f..c320340
--- a/Tizen.Network.Nsd/Tizen.Network.Nsd.sln
+++ b/Tizen.Network.Nsd/Tizen.Network.Nsd.sln
@@ -1,9 +1,9 @@
 \r
 Microsoft Visual Studio Solution File, Format Version 12.00\r
-# Visual Studio 14\r
-VisualStudioVersion = 14.0.25420.1\r
+# Visual Studio 15\r
+VisualStudioVersion = 15.0.26430.12\r
 MinimumVisualStudioVersion = 10.0.40219.1\r
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tizen.Network.Nsd", "Tizen.Network.Nsd.csproj", "{08C34D73-7986-4E6E-8C21-5343C7FEEC86}"\r
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Network.Nsd", "Tizen.Network.Nsd.csproj", "{DCFEC150-7844-4F21-A9F9-8E37E183C545}"\r
 EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
@@ -11,10 +11,10 @@ Global
                Release|Any CPU = Release|Any CPU\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {08C34D73-7986-4E6E-8C21-5343C7FEEC86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {08C34D73-7986-4E6E-8C21-5343C7FEEC86}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
-               {08C34D73-7986-4E6E-8C21-5343C7FEEC86}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
-               {08C34D73-7986-4E6E-8C21-5343C7FEEC86}.Release|Any CPU.Build.0 = Release|Any CPU\r
+               {DCFEC150-7844-4F21-A9F9-8E37E183C545}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {DCFEC150-7844-4F21-A9F9-8E37E183C545}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {DCFEC150-7844-4F21-A9F9-8E37E183C545}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {DCFEC150-7844-4F21-A9F9-8E37E183C545}.Release|Any CPU.Build.0 = Release|Any CPU\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/packaging/csapi-network-nsd.spec b/packaging/csapi-network-nsd.spec
index ec5e61e..dba9aad 100755 (executable)
--- a/packaging/csapi-network-nsd.spec
+++ b/packaging/csapi-network-nsd.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