Merge packaging information to csproj

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

diff --git a/packaging/csapi-network-mtp.spec b/packaging/csapi-network-mtp.spec
index 77fda8d..e735389 100644 (file)
--- a/packaging/csapi-network-mtp.spec
+++ b/packaging/csapi-network-mtp.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.Network.Mtp/Properties/AssemblyInfo.cs b/src/Tizen.Network.Mtp/Properties/AssemblyInfo.cs
deleted file mode 100644 (file)
index 5fb1cac..0000000
--- a/src/Tizen.Network.Mtp/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.Network.Mtp")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Tizen.Network.Mtp")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
-[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("9515cdfb-6634-4cd7-9efb-cb71628e3d92")]
-
-// 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.Network.Mtp/Tizen.Network.Mtp.csproj b/src/Tizen.Network.Mtp/Tizen.Network.Mtp.csproj
index a17234d..2956854 100644 (file)
--- a/src/Tizen.Network.Mtp/Tizen.Network.Mtp.csproj
+++ b/src/Tizen.Network.Mtp/Tizen.Network.Mtp.csproj
@@ -1,88 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{9515CDFB-6634-4CD7-9EFB-CB71628E3D92}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Tizen.Network.Mtp</RootNamespace>
-    <AssemblyName>Tizen.Network.Mtp</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>
+    <Version>1.0.0</Version>
+    <Authors>Samsung Electronics</Authors>
+    <Copyright>© Samsung Electronics Co., Ltd All Rights Reserved</Copyright>
+    <Description>Provides the Mtp 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.Network.Mtp.snk</AssemblyOriginatorKeyFile>
+    <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
   </PropertyGroup>
+
   <ItemGroup>
-    <None Include="Tizen.Network.Mtp.nuspec" />
-    <None Include="Tizen.Network.Mtp.project.json" />
-    <None Include="Tizen.Network.Mtp.snk" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Interop\Interop.Glib.cs" />
-    <Compile Include="Interop\Interop.Libc.cs" />
-    <Compile Include="Interop\Interop.Libraries.cs" />
-    <Compile Include="Interop\Interop.Mtp.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Tizen.Network.Mtp\MtpDevice.cs" />
-    <Compile Include="Tizen.Network.Mtp\MtpEnumerations.cs" />
-    <Compile Include="Tizen.Network.Mtp\MtpErrorFactory.cs" />
-    <Compile Include="Tizen.Network.Mtp\MtpEventArgs.cs" />
-    <Compile Include="Tizen.Network.Mtp\MtpManager.cs" />
-    <Compile Include="Tizen.Network.Mtp\MtpManagerEvent.cs" />
-    <Compile Include="Tizen.Network.Mtp\MtpManagerImpl.cs" />
-    <Compile Include="Tizen.Network.Mtp\MtpObject.cs" />
-    <Compile Include="Tizen.Network.Mtp\MtpStorage.cs" />
+    <PackageReference Include="Tizen" Version="1.0.5" />
   </ItemGroup>
-  <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>

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

diff --git a/src/Tizen.Network.Mtp/Tizen.Network.Mtp.project.json b/src/Tizen.Network.Mtp/Tizen.Network.Mtp.project.json
deleted file mode 100644 (file)
index 066fd72..0000000
--- a/src/Tizen.Network.Mtp/Tizen.Network.Mtp.project.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "dependencies": {
-    "NETStandard.Library": "1.6.1",
-    "Tizen": "1.0.3"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  }
-}
\ No newline at end of file

diff --git a/src/Tizen.Network.Mtp/Tizen.Network.Mtp.sln b/src/Tizen.Network.Mtp/Tizen.Network.Mtp.sln
index 0bcbb64..3355b61 100644 (file)
--- a/src/Tizen.Network.Mtp/Tizen.Network.Mtp.sln
+++ b/src/Tizen.Network.Mtp/Tizen.Network.Mtp.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.Network.Mtp", "Tizen.Network.Mtp.csproj", "{9515CDFB-6634-4CD7-9EFB-CB71628E3D92}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Network.Mtp", "Tizen.Network.Mtp.csproj", "{D9A03CCF-C199-4DC3-A980-CE44477D6DBF}"
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,10 +11,10 @@ Global
                Release|Any CPU = Release|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {9515CDFB-6634-4CD7-9EFB-CB71628E3D92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {9515CDFB-6634-4CD7-9EFB-CB71628E3D92}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {9515CDFB-6634-4CD7-9EFB-CB71628E3D92}.Release|Any CPU.ActiveCfg = Release|Any CPU
-               {9515CDFB-6634-4CD7-9EFB-CB71628E3D92}.Release|Any CPU.Build.0 = Release|Any CPU
+               {D9A03CCF-C199-4DC3-A980-CE44477D6DBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {D9A03CCF-C199-4DC3-A980-CE44477D6DBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {D9A03CCF-C199-4DC3-A980-CE44477D6DBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {D9A03CCF-C199-4DC3-A980-CE44477D6DBF}.Release|Any CPU.Build.0 = Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE