summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWonYoung Choi <wy80.choi@samsung.com>2017-06-08 00:46:04 (GMT)
committerWonYoung Choi <wy80.choi@samsung.com>2017-06-08 00:46:04 (GMT)
commit4f398e464fdd846571c5a24e07dfb1817c349953 (patch)
tree546c15f228535746dd55b25a106d39dd3ed4c45b
parenteab0454b71a3e963b0013874e697186ff4cde850 (diff)
downloadsmartcard-4f398e464fdd846571c5a24e07dfb1817c349953.zip
smartcard-4f398e464fdd846571c5a24e07dfb1817c349953.tar.gz
smartcard-4f398e464fdd846571c5a24e07dfb1817c349953.tar.bz2
Change-Id: I9b06c0edf46beaa504a88250816d362d177e1b14 Signed-off-by: WonYoung Choi <wy80.choi@samsung.com>
-rw-r--r--.gitignore7
-rw-r--r--Tizen.Network.Smartcard/Properties/AssemblyInfo.cs36
-rw-r--r--Tizen.Network.Smartcard/Tizen.Network.Smartcard.csproj110
-rw-r--r--Tizen.Network.Smartcard/Tizen.Network.Smartcard.nuspec20
-rw-r--r--Tizen.Network.Smartcard/Tizen.Network.Smartcard.project.json9
-rw-r--r--[-rwxr-xr-x]Tizen.Network.Smartcard/Tizen.Network.Smartcard.sln14
-rw-r--r--packaging/csapi-network-smartcard.spec2
7 files changed, 40 insertions, 158 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
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
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
--- 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"?>
-<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>{3EE5842E-7004-43BC-825B-29FFDEC18D4E}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Tizen.Network.Smartcard</RootNamespace>
- <AssemblyName>Tizen.Network.Smartcard</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.Network.Smartcard.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.Smartcard.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Tizen.Network.Smartcard\SmartcardChannel.cs" />
- <Compile Include="Tizen.Network.Smartcard\SmartcardErrorFactory.cs" />
- <Compile Include="Tizen.Network.Smartcard\SmartcardManager.cs" />
- <Compile Include="Tizen.Network.Smartcard\SmartcardManagerImpl.cs" />
- <Compile Include="Tizen.Network.Smartcard\SmartcardReader.cs" />
- <Compile Include="Tizen.Network.Smartcard\SmartcardSession.cs" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Tizen.Network.Smartcard.nuspec" />
- <None Include="Tizen.Network.Smartcard.project.json" />
- <None Include="Tizen.Network.Smartcard.snk" />
- </ItemGroup>
- <Import Project="$(MSBuildExtensionsPath)\Tizen\Tizen.CSharp.GBS.targets" Condition="Exists('$(MSBuildExtensionsPath)\Tizen\Tizen.CSharp.GBS.targets')" />
- <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.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
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
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
index 6f061da..5dd26ef 100755..100644
--- a/Tizen.Network.Smartcard/Tizen.Network.Smartcard.sln
+++ b/Tizen.Network.Smartcard/Tizen.Network.Smartcard.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.Smartcard", "Tizen.Network.Smartcard.csproj", "{3EE5842E-7004-43BC-825B-29FFDEC18D4E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Network.Smartcard", "Tizen.Network.Smartcard.csproj", "{289EA0B1-5E0D-413F-B09C-70CDCB1143B0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,10 +11,10 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {3EE5842E-7004-43BC-825B-29FFDEC18D4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3EE5842E-7004-43BC-825B-29FFDEC18D4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3EE5842E-7004-43BC-825B-29FFDEC18D4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3EE5842E-7004-43BC-825B-29FFDEC18D4E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {289EA0B1-5E0D-413F-B09C-70CDCB1143B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {289EA0B1-5E0D-413F-B09C-70CDCB1143B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {289EA0B1-5E0D-413F-B09C-70CDCB1143B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {289EA0B1-5E0D-413F-B09C-70CDCB1143B0}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/packaging/csapi-network-smartcard.spec b/packaging/csapi-network-smartcard.spec
index b2278da..7667517 100644
--- 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