projects / platform / core / csapi / tizenfx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7e186d4)
Release 4.0.0-preview1-00117
authorDotnetBuild <dotnetbuild.tizen@gmail.com>
Thu, 24 Aug 2017 15:00:16 +0000 (00:00 +0900)
committerDotnetBuild <dotnetbuild.tizen@gmail.com>
Thu, 24 Aug 2017 15:00:16 +0000 (00:00 +0900)
build.sh patch | blob | history
packaging/csapi-tizenfx.spec patch | blob | history
pkg/PlatformFileList.txt patch | blob | history
pkg/Tizen.NET.nuspec patch | blob | history
src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcManager.cs patch | blob | history

diff --git a/build.sh b/build.sh
index a31b94f..4526258 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -12,12 +12,21 @@ usage() {
   echo "    Options:"
   echo "        -h, --help            Show this usages message"
   echo "        -b, --build [module]  Build a module"
-  echo "        -f, --full            Build all modules in src/ directory. The module should be added in pkg/Tizen.NET.Private.sln"
+  echo "        -f, --full            Build all modules in src/ directory. (pkg/Tizen.NET.Private.sln)"
   echo "        -d, --dummy           Build dummy modules"
   echo "        -p, --pack            Make nuget packages"
   echo "        -c, --clean           Clean all artifacts"
 }
 
+dotnet_build() {
+  if [ -d /nuget ]; then
+    NUGET_SOURCE_OPT="--source /nuget"
+  fi
+  PROJ=$1; shift
+  dotnet restore $PROJ $NUGET_SOURCE_OPT
+  dotnet build $PROJ --no-restore --configuration=Release $@
+}
+
 cmd_clean() {
   rm -fr $OUTDIR
   LIST=$(find $SCRIPT_DIR -type d -a -name bin -o -name obj)
@@ -31,11 +40,11 @@ cmd_build() {
     echo "No module specified."
     exit 1
   fi
-  dotnet build $SCRIPT_DIR/src/$1 --configuration=Release --output=$OUTDIR/bin
+  dotnet_build $SCRIPT_DIR/src/$1 --output=$OUTDIR/bin
 }
 
 cmd_full_build() {
-  dotnet build $SCRIPT_DIR/pkg/Tizen.NET.Private.sln --configuration=Release --output=$OUTDIR/bin
+  dotnet_build $SCRIPT_DIR/pkg/Tizen.NET.Private.sln --output=$OUTDIR/bin
 }
 
 cmd_pack() {
@@ -50,7 +59,7 @@ cmd_pack() {
 }
 
 cmd_dummy_build() {
-  dotnet build $SCRIPT_DIR/pkg/Tizen.NET.Dummy.csproj --configuration=Release
+  dotnet_build $SCRIPT_DIR/pkg/Tizen.NET.Dummy.csproj
 }
 
 OPTS=`getopt -o hcbfpd --long help,clean,build,full,pack,dummy -n 'build' -- "$@"`
diff --git a/packaging/csapi-tizenfx.spec b/packaging/csapi-tizenfx.spec
index e93082d..919724c 100644 (file)
--- a/packaging/csapi-tizenfx.spec
+++ b/packaging/csapi-tizenfx.spec
@@ -10,7 +10,7 @@
 
 Name:       csapi-tizenfx
 Summary:    Assemblies of Tizen .NET
-Version:    4.0.0.111
+Version:    4.0.0.117
 Release:    1
 Group:      Development/Libraries
 License:    Apache-2.0
diff --git a/pkg/PlatformFileList.txt b/pkg/PlatformFileList.txt
index 19c6786..8b1a8b5 100644 (file)
--- a/pkg/PlatformFileList.txt
+++ b/pkg/PlatformFileList.txt
@@ -33,8 +33,8 @@ Tizen.dll                                          #common #mobile #mobile-emul
 Tizen.Location.dll                                 #mobile #mobile-emul #tv #ivi #wearable
 Tizen.Location.Geofence.dll                        #mobile #mobile-emul
 Tizen.Log.dll                                      #common #mobile #mobile-emul #tv #ivi #wearable
-Tizen.Maps.dll                                     #mobile #mobile-emul #tv
-Tizen.Messaging.dll                                #mobile #mobile-emul
+Tizen.Maps.dll                                     #mobile #mobile-emul #tv #wearable
+Tizen.Messaging.dll                                #mobile #mobile-emul #wearable
 Tizen.Messaging.Push.dll                           #mobile #mobile-emul #tv #ivi
 Tizen.Multimedia.AudioIO.dll                       #common #mobile #mobile-emul #tv #ivi
 Tizen.Multimedia.Camera.dll                        #common #mobile #mobile-emul #tv #ivi
diff --git a/pkg/Tizen.NET.nuspec b/pkg/Tizen.NET.nuspec
index 20925ba..9a38e22 100644 (file)
--- a/pkg/Tizen.NET.nuspec
+++ b/pkg/Tizen.NET.nuspec
@@ -16,6 +16,9 @@
     <file src="bin\ElmSharp.dll" target="lib\netstandard1.6" />
     <file src="bin\ElmSharp.pdb" target="lib\netstandard1.6" />
     <file src="bin\ElmSharp.xml" target="lib\netstandard1.6" />
+    <file src="bin\ElmSharp.Wearable.dll" target="lib\netstandard1.6" />
+    <file src="bin\ElmSharp.Wearable.pdb" target="lib\netstandard1.6" />
+    <file src="bin\ElmSharp.Wearable.xml" target="lib\netstandard1.6" />
     <file src="bin\Tizen.Account.AccountManager.dll" target="lib\netstandard1.6" />
     <file src="bin\Tizen.Account.AccountManager.pdb" target="lib\netstandard1.6" />
     <file src="bin\Tizen.Account.AccountManager.xml" target="lib\netstandard1.6" />
@@ -64,6 +67,9 @@
     <file src="bin\Tizen.Applications.UI.dll" target="lib\netstandard1.6" />
     <file src="bin\Tizen.Applications.UI.pdb" target="lib\netstandard1.6" />
     <file src="bin\Tizen.Applications.UI.xml" target="lib\netstandard1.6" />
+    <file src="bin\Tizen.Applications.WatchApplication.dll" target="lib\netstandard1.6" />
+    <file src="bin\Tizen.Applications.WatchApplication.pdb" target="lib\netstandard1.6" />
+    <file src="bin\Tizen.Applications.WatchApplication.xml" target="lib\netstandard1.6" />
     <file src="bin\Tizen.Applications.WidgetApplication.dll" target="lib\netstandard1.6" />
     <file src="bin\Tizen.Applications.WidgetApplication.pdb" target="lib\netstandard1.6" />
     <file src="bin\Tizen.Applications.WidgetApplication.xml" target="lib\netstandard1.6" />
@@ -151,6 +157,9 @@
     <file src="bin\Tizen.Network.Nfc.dll" target="lib\netstandard1.6" />
     <file src="bin\Tizen.Network.Nfc.pdb" target="lib\netstandard1.6" />
     <file src="bin\Tizen.Network.Nfc.xml" target="lib\netstandard1.6" />
+    <file src="bin\Tizen.Network.Nsd.dll" target="lib\netstandard1.6" />
+    <file src="bin\Tizen.Network.Nsd.pdb" target="lib\netstandard1.6" />
+    <file src="bin\Tizen.Network.Nsd.xml" target="lib\netstandard1.6" />
     <file src="bin\Tizen.Network.Smartcard.dll" target="lib\netstandard1.6" />
     <file src="bin\Tizen.Network.Smartcard.pdb" target="lib\netstandard1.6" />
     <file src="bin\Tizen.Network.Smartcard.xml" target="lib\netstandard1.6" />
@@ -160,6 +169,15 @@
     <file src="bin\Tizen.Network.WiFiDirect.dll" target="lib\netstandard1.6" />
     <file src="bin\Tizen.Network.WiFiDirect.pdb" target="lib\netstandard1.6" />
     <file src="bin\Tizen.Network.WiFiDirect.xml" target="lib\netstandard1.6" />
+    <file src="bin\Tizen.PhonenumberUtils.dll" target="lib\netstandard1.6" />
+    <file src="bin\Tizen.PhonenumberUtils.pdb" target="lib\netstandard1.6" />
+    <file src="bin\Tizen.PhonenumberUtils.xml" target="lib\netstandard1.6" />
+    <file src="bin\Tizen.Pims.Calendar.dll" target="lib\netstandard1.6" />
+    <file src="bin\Tizen.Pims.Calendar.pdb" target="lib\netstandard1.6" />
+    <file src="bin\Tizen.Pims.Calendar.xml" target="lib\netstandard1.6" />
+    <file src="bin\Tizen.Pims.Contacts.dll" target="lib\netstandard1.6" />
+    <file src="bin\Tizen.Pims.Contacts.pdb" target="lib\netstandard1.6" />
+    <file src="bin\Tizen.Pims.Contacts.xml" target="lib\netstandard1.6" />
     <file src="bin\Tizen.Security.SecureRepository.dll" target="lib\netstandard1.6" />
     <file src="bin\Tizen.Security.SecureRepository.pdb" target="lib\netstandard1.6" />
     <file src="bin\Tizen.Security.SecureRepository.xml" target="lib\netstandard1.6" />
diff --git a/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcManager.cs b/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcManager.cs
index c8ad62e..98fa29a 100755 (executable)
--- a/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcManager.cs
+++ b/src/Tizen.Network.Nfc/Tizen.Network.Nfc/NfcManager.cs
@@ -36,7 +36,9 @@ namespace Tizen.Network.Nfc
         {
             get
             {
-                bool isNfcSupported = SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
+                bool isNfcSupported = false;
+
+                SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
 
                 if (!isNfcSupported)
                 {
@@ -62,7 +64,9 @@ namespace Tizen.Network.Nfc
         {
             get
             {
-                bool isNfcSupported = SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
+                bool isNfcSupported = false;
+
+                SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
 
                 if (!isNfcSupported)
                 {
@@ -88,8 +92,11 @@ namespace Tizen.Network.Nfc
         {
             get
             {
-                bool isNfcSupported = SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
-                bool isTagSupported = SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc.tag", out isTagSupported);
+                bool isNfcSupported = false;
+                bool isTagSupported = false;
+
+                SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
+                SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc.tag", out isTagSupported);
 
                 if (!isNfcSupported || !isTagSupported)
                 {
@@ -107,8 +114,11 @@ namespace Tizen.Network.Nfc
             }
             set
             {
-                bool isNfcSupported = SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
-                bool isTagSupported = SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc.tag", out isTagSupported);
+                bool isNfcSupported = false;
+                bool isTagSupported = false;
+
+                SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
+                SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc.tag", out isTagSupported);
 
                 if (!isNfcSupported || !isTagSupported)
                 {
@@ -135,8 +145,11 @@ namespace Tizen.Network.Nfc
         {
             get
             {
-                bool isNfcSupported = SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
-                bool isCeSupported = SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc.cardemulation", out isCeSupported);
+                bool isNfcSupported = false;
+                bool isCeSupported = false;
+
+                SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
+                SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc.cardemulation", out isCeSupported);
 
                 if (!isNfcSupported || !isCeSupported)
                 {
@@ -154,8 +167,11 @@ namespace Tizen.Network.Nfc
             }
             set
             {
-                bool isNfcSupported = SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
-                bool isCeSupported = SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc.cardemulation", out isCeSupported);
+                bool isNfcSupported = false;
+                bool isCeSupported = false;
+
+                SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
+                SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc.cardemulation", out isCeSupported);
 
                 if (!isNfcSupported || !isCeSupported)
                 {
@@ -182,7 +198,9 @@ namespace Tizen.Network.Nfc
         {
             get
             {
-                bool isNfcSupported = SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
+                bool isNfcSupported = false;
+
+                SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
 
                 if (!isNfcSupported)
                 {
@@ -200,7 +218,9 @@ namespace Tizen.Network.Nfc
             }
             set
             {
-                bool isNfcSupported = SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
+                bool isNfcSupported = false;
+
+                SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
 
                 if (!isNfcSupported)
                 {
@@ -226,7 +246,9 @@ namespace Tizen.Network.Nfc
         {
             get
             {
-                bool isNfcSupported = SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
+                bool isNfcSupported = false;
+
+                SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
 
                 if (!isNfcSupported)
                 {
@@ -250,8 +272,11 @@ namespace Tizen.Network.Nfc
         /// <since_tizen> 3 </since_tizen>
         static public NfcTagAdapter GetTagAdapter()
         {
-            bool isNfcSupported = SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
-            bool isTagSupported = SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc.tag", out isTagSupported);
+            bool isNfcSupported = false;
+            bool isTagSupported = false;
+
+            SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
+            SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc.tag", out isTagSupported);
 
             if (!isNfcSupported || !isTagSupported)
             {
@@ -274,8 +299,11 @@ namespace Tizen.Network.Nfc
         /// <since_tizen> 3 </since_tizen>
         static public NfcP2pAdapter GetP2pAdapter()
         {
-            bool isNfcSupported = SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
-            bool isP2pSupported = SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc.p2p", out isP2pSupported);
+            bool isNfcSupported = false;
+            bool isP2pSupported = false;
+
+            SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
+            SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc.p2p", out isP2pSupported);
 
             if (!isNfcSupported || !isP2pSupported)
             {
@@ -298,8 +326,11 @@ namespace Tizen.Network.Nfc
         /// <since_tizen> 3 </since_tizen>
         static public NfcCardEmulationAdapter GetCardEmulationAdapter()
         {
-            bool isNfcSupported = SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
-            bool isCeSupported = SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc.cardemulation", out isCeSupported);
+            bool isNfcSupported = false;
+            bool isCeSupported = false;
+
+            SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
+            SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc.cardemulation", out isCeSupported);
 
             if (!isNfcSupported || !isCeSupported)
             {
@@ -324,7 +355,9 @@ namespace Tizen.Network.Nfc
         /// <privilege>http://tizen.org/privilege/nfc.admin</privilege>
         static public Task SetActivationAsync(bool activation)
         {
-            bool isNfcSupported = SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
+            bool isNfcSupported = false;
+
+            SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
 
             if (!isNfcSupported)
             {
@@ -349,7 +382,9 @@ namespace Tizen.Network.Nfc
         {
             add
             {
-                bool isNfcSupported = SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
+                bool isNfcSupported = false;
+
+                SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
 
                 if (!isNfcSupported)
                 {
@@ -367,7 +402,9 @@ namespace Tizen.Network.Nfc
             }
             remove
             {
-                bool isNfcSupported = SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
+                bool isNfcSupported = false;
+
+                SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
 
                 if (!isNfcSupported)
                 {
@@ -393,7 +430,9 @@ namespace Tizen.Network.Nfc
         {
             add
             {
-                bool isNfcSupported = SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
+                bool isNfcSupported = false;
+
+                SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
 
                 if (!isNfcSupported)
                 {
@@ -411,7 +450,9 @@ namespace Tizen.Network.Nfc
             }
             remove
             {
-                bool isNfcSupported = SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
+                bool isNfcSupported = false;
+
+                SystemInfo.TryGetValue("http://tizen.org/feature/network.nfc", out isNfcSupported);
 
                 if (!isNfcSupported)
                 {
Domain: Dotnet / Frameworks;