diff options
author | SukHyung, Kang <shine.kang@samsung.com> | 2016-12-14 16:44:30 +0900 |
---|---|---|
committer | SukHyung, Kang <shine.kang@samsung.com> | 2016-12-14 16:44:30 +0900 |
commit | ca339f6ccc6263737d5f4651f8457f9475c9c39d (patch) | |
tree | 3e067fcf6dcceafe82eb13f0211174537ccf3bce | |
parent | cadcead95dac65fe05545122de4c730c1e5f0f9b (diff) | |
download | widget-control-ca339f6ccc6263737d5f4651f8457f9475c9c39d.tar.gz widget-control-ca339f6ccc6263737d5f4651f8457f9475c9c39d.tar.bz2 widget-control-ca339f6ccc6263737d5f4651f8457f9475c9c39d.zip |
merge widget-control code from spin csapisubmit/tizen/20161214.063015accepted/tizen/mobile/20161215.072338
Change-Id: I96489138fd107c05f578d6679e1d80531d180b65
Signed-off-by: SukHyung, Kang <shine.kang@samsung.com>
-rwxr-xr-x[-rw-r--r--] | Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.Net45.project.json | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.nuspec | 33 | ||||
-rwxr-xr-x | Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.project.json | 4 | ||||
-rwxr-xr-x | packaging/csapi-widget-control.spec | 3 |
4 files changed, 25 insertions, 19 deletions
diff --git a/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.Net45.project.json b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.Net45.project.json index 21ab9e8..7d360e7 100644..100755 --- a/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.Net45.project.json +++ b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.Net45.project.json @@ -1,7 +1,7 @@ { "dependencies": { - "Tizen": "1.0.1", - "Tizen.Applications": "1.0.1", + "Tizen": "1.0.2", + "Tizen.Applications": "1.0.2", }, "frameworks": { "net45": {} diff --git a/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.nuspec b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.nuspec index 7be3997..cf9d403 100644..100755 --- a/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.nuspec +++ b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.nuspec @@ -1,17 +1,22 @@ <?xml version="1.0"?> <package> - <metadata> - <id>Tizen.Applications.WidgetControl</id> - <version>$version$</version> - <authors>Tizen Developers</authors> - <description>Widget control API for Tizen.Net</description> - <dependencies> - <dependency id="Tizen" version="1.0.1" /> - <dependency id="Tizen.Applications" version="1.0.1" /> - </dependencies> - </metadata> - <files> - <file src="bin/$Configuration$/Tizen.Applications.WidgetControl.dll" target="lib/netstandard1.3" /> - <file src="bin/$Configuration$/Net45/Tizen.Applications.WidgetControl.dll" target="lib/net45" /> - </files> + <metadata> + <id>Tizen.Applications.WidgetControl</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 Widget control API for Tizen.Net</description> + <dependencies> + <dependency id="Tizen" version="1.0.2" /> + <dependency id="Tizen.Applications" version="1.0.2" /> + </dependencies> + </metadata> + <files> + <file src="bin/$Configuration$/Tizen.Applications.WidgetControl.dll" target="lib/netstandard1.3" /> + <file src="bin/$Configuration$/Net45/Tizen.Applications.WidgetControl.dll" target="lib/net45" /> + </files> </package> diff --git a/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.project.json b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.project.json index 844a5fe..5e62e15 100755 --- a/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.project.json +++ b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.project.json @@ -1,8 +1,8 @@ {
"dependencies": {
"NETStandard.Library": "1.6.0",
- "Tizen": "1.0.1",
- "Tizen.Applications": "1.0.1"
+ "Tizen": "1.0.2",
+ "Tizen.Applications": "1.0.2"
},
"frameworks": {
"netstandard1.3": {}
diff --git a/packaging/csapi-widget-control.spec b/packaging/csapi-widget-control.spec index d370803..af668e1 100755 --- a/packaging/csapi-widget-control.spec +++ b/packaging/csapi-widget-control.spec @@ -8,7 +8,7 @@ Name: csapi-widget-control Summary: Tizen widget control API for C# -Version: 1.0.1 +Version: 1.0.2 Release: 1 Group: Development/Libraries License: Apache-2.0 @@ -17,6 +17,7 @@ Source0: %{name}-%{version}.tar.gz Source1: %{name}.manifest AutoReqProv: no +ExcludeArch: %{ix86} aarch64 BuildRequires: mono-compiler BuildRequires: mono-devel |