Merge packaging information to csproj

Change-Id: I9b06c0edf46beaa504a88250816d362d177e1b14
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.Smartcard/Properties/AssemblyInfo.cs b/Tizen.Network.Smartcard/Properties/AssemblyInfo.cs
deleted file mode 100644 (file)
index 8833675..0000000
--- a/Tizen.Network.Smartcard/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.Smartcard")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Tizen.Network.Smartcard")]
-[assembly: AssemblyCopyright("Copyright \u00A9  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("99a90243-7db1-4704-a078-3529c2da4e81")]
-
-// 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/Tizen.Network.Smartcard/Tizen.Network.Smartcard.csproj b/Tizen.Network.Smartcard/Tizen.Network.Smartcard.csproj
index ed0c2db..ce0f1e0 100644 (file)
--- a/Tizen.Network.Smartcard/Tizen.Network.Smartcard.csproj
+++ b/Tizen.Network.Smartcard/Tizen.Network.Smartcard.csproj
@@ -1,85 +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>{3EE5842E-7004-43BC-825B-29FFDEC18D4E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>Tizen.Network.Smartcard</RootNamespace>\r
-    <AssemblyName>Tizen.Network.Smartcard</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
-    <Prefer32Bit>false</Prefer32Bit>\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
-    <Prefer32Bit>false</Prefer32Bit>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>Tizen.Network.Smartcard.snk</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Compile Include="Interop\Interop.Glib.cs" />\r
-    <Compile Include="Interop\Interop.Libc.cs" />\r
-    <Compile Include="Interop\Interop.Libraries.cs" />\r
-    <Compile Include="Interop\Interop.Smartcard.cs" />\r
-    <Compile Include="Properties\AssemblyInfo.cs" />\r
-    <Compile Include="Tizen.Network.Smartcard\SmartcardChannel.cs" />\r
-    <Compile Include="Tizen.Network.Smartcard\SmartcardErrorFactory.cs" />\r
-    <Compile Include="Tizen.Network.Smartcard\SmartcardManager.cs" />\r
-    <Compile Include="Tizen.Network.Smartcard\SmartcardManagerImpl.cs" />\r
-    <Compile Include="Tizen.Network.Smartcard\SmartcardReader.cs" />\r
-    <Compile Include="Tizen.Network.Smartcard\SmartcardSession.cs" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <None Include="Tizen.Network.Smartcard.nuspec" />\r
-    <None Include="Tizen.Network.Smartcard.project.json" />\r
-    <None Include="Tizen.Network.Smartcard.snk" />\r
-  </ItemGroup>\r
-  <Import Project="$(MSBuildExtensionsPath)\Tizen\Tizen.CSharp.GBS.targets" Condition="Exists('$(MSBuildExtensionsPath)\Tizen\Tizen.CSharp.GBS.targets')" />\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.\r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-  <PropertyGroup>\r
-    <!-- https://github.com/dotnet/corefxlab/tree/master/samples/NetCoreSample and\r
-       https://docs.microsoft.com/en-us/dotnet/articles/core/tutorials/target-dotnetcore-with-msbuild\r
-    -->\r
-    <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two\r
-       properties to any folder that exists to skip the GetReferenceAssemblyPaths task (not target) and\r
-       to prevent it from outputting a warning (MSB3644).\r
-    -->\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.5</Version>
+    <Authors>Samsung Electronics</Authors>
+    <Copyright>© Samsung Electronics Co., Ltd All Rights Reserved</Copyright>
+    <Description>Provides the Smartcard 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.3</TargetFramework>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <SignAssembly>True</SignAssembly>
+    <AssemblyOriginatorKeyFile>Tizen.Network.Smartcard.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.Smartcard/Tizen.Network.Smartcard.nuspec b/Tizen.Network.Smartcard/Tizen.Network.Smartcard.nuspec
deleted file mode 100644 (file)
index 7fec17b..0000000
--- a/Tizen.Network.Smartcard/Tizen.Network.Smartcard.nuspec
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<package>
-       <metadata>
-               <id>Tizen.Network.Smartcard</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 Smartcard API for Tizen.Net</description>
-               <dependencies>
-                       <dependency id="Tizen" version="1.0.2" />
-               </dependencies>
-       </metadata>
-       <files>
-               <file src="bin/$Configuration$/Tizen.Network.Smartcard.dll" target="lib/netstandard1.3" />
-       </files>
-</package>

diff --git a/Tizen.Network.Smartcard/Tizen.Network.Smartcard.project.json b/Tizen.Network.Smartcard/Tizen.Network.Smartcard.project.json
deleted file mode 100644 (file)
index a4c6be0..0000000
--- a/Tizen.Network.Smartcard/Tizen.Network.Smartcard.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/Tizen.Network.Smartcard/Tizen.Network.Smartcard.sln b/Tizen.Network.Smartcard/Tizen.Network.Smartcard.sln
old mode 100755 (executable)
new mode 100644 (file)
index 6f061da..5dd26ef
--- a/Tizen.Network.Smartcard/Tizen.Network.Smartcard.sln
+++ b/Tizen.Network.Smartcard/Tizen.Network.Smartcard.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.Smartcard", "Tizen.Network.Smartcard.csproj", "{3EE5842E-7004-43BC-825B-29FFDEC18D4E}"\r
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Network.Smartcard", "Tizen.Network.Smartcard.csproj", "{289EA0B1-5E0D-413F-B09C-70CDCB1143B0}"\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
-               {3EE5842E-7004-43BC-825B-29FFDEC18D4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {3EE5842E-7004-43BC-825B-29FFDEC18D4E}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
-               {3EE5842E-7004-43BC-825B-29FFDEC18D4E}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
-               {3EE5842E-7004-43BC-825B-29FFDEC18D4E}.Release|Any CPU.Build.0 = Release|Any CPU\r
+               {289EA0B1-5E0D-413F-B09C-70CDCB1143B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {289EA0B1-5E0D-413F-B09C-70CDCB1143B0}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {289EA0B1-5E0D-413F-B09C-70CDCB1143B0}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {289EA0B1-5E0D-413F-B09C-70CDCB1143B0}.Release|Any CPU.Build.0 = Release|Any CPU\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/packaging/csapi-network-smartcard.spec b/packaging/csapi-network-smartcard.spec
index b2278da..7667517 100644 (file)
--- a/packaging/csapi-network-smartcard.spec
+++ b/packaging/csapi-network-smartcard.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