diff options
author | WonYoung Choi <wy80.choi@samsung.com> | 2017-06-08 09:42:20 +0900 |
---|---|---|
committer | WonYoung Choi <wy80.choi@samsung.com> | 2017-06-08 09:42:20 +0900 |
commit | 5f24ed5c7be1eefc9bff7da5f5dae453ad822520 (patch) | |
tree | 54dce8f7b41b9416511af0a4f6c90acf0c579e61 | |
parent | 4ba96df0755ddc7e55d7764db09e4b082155d092 (diff) | |
download | nfc-submit/tizen/20170609.015750.tar.gz nfc-submit/tizen/20170609.015750.tar.bz2 nfc-submit/tizen/20170609.015750.zip |
Merge packaging information to csprojsubmit/tizen/20170703.105553submit/tizen/20170612.015813submit/tizen/20170609.015750accepted/tizen/unified/20170612.073741
Change-Id: I43c36261caf3f9996e41b4957755836f30084b1b
Signed-off-by: WonYoung Choi <wy80.choi@samsung.com>
-rw-r--r-- | .gitignore | 7 | ||||
-rw-r--r-- | Tizen.Network.Nfc/Properties/AssemblyInfo.cs | 36 | ||||
-rw-r--r-- | Tizen.Network.Nfc/Tizen.Network.Nfc.csproj | 120 | ||||
-rw-r--r-- | Tizen.Network.Nfc/Tizen.Network.Nfc.nuspec | 21 | ||||
-rwxr-xr-x | Tizen.Network.Nfc/Tizen.Network.Nfc.project.json | 10 | ||||
-rw-r--r--[-rwxr-xr-x] | Tizen.Network.Nfc/Tizen.Network.Nfc.sln | 14 | ||||
-rw-r--r-- | packaging/csapi-network-nfc.spec | 2 |
7 files changed, 41 insertions, 169 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.Nfc/Properties/AssemblyInfo.cs b/Tizen.Network.Nfc/Properties/AssemblyInfo.cs deleted file mode 100644 index 0524a42..0000000 --- a/Tizen.Network.Nfc/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.Nfc")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Tizen.Network.Nfc")] -[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.Nfc/Tizen.Network.Nfc.csproj b/Tizen.Network.Nfc/Tizen.Network.Nfc.csproj index 054a0fb..507eca6 100644 --- a/Tizen.Network.Nfc/Tizen.Network.Nfc.csproj +++ b/Tizen.Network.Nfc/Tizen.Network.Nfc.csproj @@ -1,94 +1,26 @@ -<?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.Nfc</RootNamespace>
- <AssemblyName>Tizen.Network.Nfc</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.Nfc.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.Nfc.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Tizen.Network.Nfc\NfcCallbackData.cs" />
- <Compile Include="Tizen.Network.Nfc\NfcCardEmulationAdapter.cs" />
- <Compile Include="Tizen.Network.Nfc\NfcEnumerations.cs" />
- <Compile Include="Tizen.Network.Nfc\NfcErrorFactory.cs" />
- <Compile Include="Tizen.Network.Nfc\NfcEventArgs.cs" />
- <Compile Include="Tizen.Network.Nfc\NfcSecureElement.cs" />
- <Compile Include="Tizen.Network.Nfc\NfcManager.cs" />
- <Compile Include="Tizen.Network.Nfc\NfcManagerEvent.cs" />
- <Compile Include="Tizen.Network.Nfc\NfcManagerImpl.cs" />
- <Compile Include="Tizen.Network.Nfc\NfcNdefMessage.cs" />
- <Compile Include="Tizen.Network.Nfc\NfcNdefRecord.cs" />
- <Compile Include="Tizen.Network.Nfc\NfcP2p.cs" />
- <Compile Include="Tizen.Network.Nfc\NfcP2pAdapter.cs" />
- <Compile Include="Tizen.Network.Nfc\NfcTag.cs" />
- <Compile Include="Tizen.Network.Nfc\NfcTagAdapter.cs" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Tizen.Network.Nfc.nuspec" />
- <None Include="Tizen.Network.Nfc.project.json" />
- <None Include="Tizen.Network.Nfc.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.10</Version> + <Authors>Samsung Electronics</Authors> + <Copyright>© Samsung Electronics Co., Ltd All Rights Reserved</Copyright> + <Description>Provides the Nfc 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.Nfc.snk</AssemblyOriginatorKeyFile> + <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign> + </PropertyGroup> + + <ItemGroup> + <PackageReference Include="Tizen" Version="1.0.5" /> + <PackageReference Include="Tizen.System.Information" Version="1.0.4" /> + </ItemGroup> + +</Project> diff --git a/Tizen.Network.Nfc/Tizen.Network.Nfc.nuspec b/Tizen.Network.Nfc/Tizen.Network.Nfc.nuspec deleted file mode 100644 index 1b61ba5..0000000 --- a/Tizen.Network.Nfc/Tizen.Network.Nfc.nuspec +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0"?> -<package> - <metadata> - <id>Tizen.Network.Nfc</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 Nfc API for Tizen.Net</description> - <dependencies> - <dependency id="Tizen" version="1.0.2" /> - <dependency id="Tizen.System.Information" version="1.0.1" /> - </dependencies> - </metadata> - <files> - <file src="bin/$Configuration$/Tizen.Network.Nfc.dll" target="lib/netstandard1.3" /> - </files> -</package> diff --git a/Tizen.Network.Nfc/Tizen.Network.Nfc.project.json b/Tizen.Network.Nfc/Tizen.Network.Nfc.project.json deleted file mode 100755 index d9a500e..0000000 --- a/Tizen.Network.Nfc/Tizen.Network.Nfc.project.json +++ /dev/null @@ -1,10 +0,0 @@ -{
- "dependencies": {
- "NETStandard.Library": "1.6.1",
- "Tizen": "1.0.2",
- "Tizen.System.Information": "1.0.1"
- },
- "frameworks": {
- "netstandard1.3": {}
- }
-}
\ No newline at end of file diff --git a/Tizen.Network.Nfc/Tizen.Network.Nfc.sln b/Tizen.Network.Nfc/Tizen.Network.Nfc.sln index e6b8d9b..cc01b8d 100755..100644 --- a/Tizen.Network.Nfc/Tizen.Network.Nfc.sln +++ b/Tizen.Network.Nfc/Tizen.Network.Nfc.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.Nfc", "Tizen.Network.Nfc.csproj", "{3EE5842E-7004-43BC-825B-29FFDEC18D4E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Network.Nfc", "Tizen.Network.Nfc.csproj", "{F7B4AF9D-AD6F-4FC7-A820-E87B96311134}"
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
+ {F7B4AF9D-AD6F-4FC7-A820-E87B96311134}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F7B4AF9D-AD6F-4FC7-A820-E87B96311134}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F7B4AF9D-AD6F-4FC7-A820-E87B96311134}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F7B4AF9D-AD6F-4FC7-A820-E87B96311134}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/packaging/csapi-network-nfc.spec b/packaging/csapi-network-nfc.spec index 20b9230..b4e5d7d 100644 --- a/packaging/csapi-network-nfc.spec +++ b/packaging/csapi-network-nfc.spec @@ -31,7 +31,7 @@ cp %{SOURCE1} . %build for ASM in %{Assemblies}; do %dotnet_build $ASM -%dotnet_pack $ASM/$ASM.nuspec %{version} +%dotnet_pack $ASM done %install |