summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWonYoung Choi <wy80.choi@samsung.com>2017-06-08 09:53:38 +0900
committerWonYoung Choi <wy80.choi@samsung.com>2017-06-08 19:07:26 +0900
commit766d1198ec6b781f7a9eef65246e3e2a16231059 (patch)
treeda4d1b43c8c522fdfca9edeca6ce3d65732f327c
parent0dcc9bd58a492c1dcb79fae342059b92ef52b2f1 (diff)
downloadwifi-766d1198ec6b781f7a9eef65246e3e2a16231059.tar.gz
wifi-766d1198ec6b781f7a9eef65246e3e2a16231059.tar.bz2
wifi-766d1198ec6b781f7a9eef65246e3e2a16231059.zip
Merge packaging information to csprojsubmit/tizen/20170609.022236
Change-Id: I60160d54aa04e002c74ace9985653239e471e800 Signed-off-by: WonYoung Choi <wy80.choi@samsung.com>
-rw-r--r--.gitignore7
-rw-r--r--Tizen.Network.WiFi/Tizen.Network.WiFi.csproj12
-rw-r--r--Tizen.Network.WiFi/Tizen.Network.WiFi.nuspec18
-rwxr-xr-xpackaging/csapi-network-wifi.spec2
4 files changed, 18 insertions, 21 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.WiFi/Tizen.Network.WiFi.csproj b/Tizen.Network.WiFi/Tizen.Network.WiFi.csproj
index 832c85e..7a6e172 100644
--- a/Tizen.Network.WiFi/Tizen.Network.WiFi.csproj
+++ b/Tizen.Network.WiFi/Tizen.Network.WiFi.csproj
@@ -1,16 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
+ <Version>1.0.17</Version>
+ <Authors>Samsung Electronics</Authors>
+ <Copyright>© Samsung Electronics Co., Ltd All Rights Reserved</Copyright>
+ <Description>Provides the Wi-Fi 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.WiFi.snk</AssemblyOriginatorKeyFile>
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
- <GenerateReferenceAssembly>True</GenerateReferenceAssembly>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="System.Threading.Thread" Version="4.3.0" />
<PackageReference Include="Tizen" Version="1.0.5" />
<PackageReference Include="Tizen.Network.Connection" Version="1.0.18" />
</ItemGroup>
diff --git a/Tizen.Network.WiFi/Tizen.Network.WiFi.nuspec b/Tizen.Network.WiFi/Tizen.Network.WiFi.nuspec
deleted file mode 100644
index 4d77492..0000000
--- a/Tizen.Network.WiFi/Tizen.Network.WiFi.nuspec
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package>
- <metadata>
- <id>Tizen.Network.WiFi</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 Wi-Fi APIs for Tizen.Network.WiFi</description>
- <dependencies>
- <dependency id="Tizen" version="1.0.2" />
- <dependency id="Tizen.Network.Connection" version="1.0.10" />
- </dependencies>
- </metadata>
-</package>
diff --git a/packaging/csapi-network-wifi.spec b/packaging/csapi-network-wifi.spec
index c081be4..a97ee3d 100755
--- a/packaging/csapi-network-wifi.spec
+++ b/packaging/csapi-network-wifi.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