From d22931b9b5250099abba0ca5af244999d88764d8 Mon Sep 17 00:00:00 2001 From: DotnetBuild Date: Tue, 12 Sep 2017 08:40:55 +0900 Subject: [PATCH] Release 4.0.0-preview1-00184 --- build.sh | 12 +++-- build/build.dummy.csproj | 6 +-- build/build.proj | 14 ------ build/common.props | 2 - build/dependencies.props | 7 --- packaging/csapi-tizenfx.spec | 2 +- pkg/Tizen.NET.Private.nuspec | 12 ++--- pkg/Tizen.NET.nuspec | 6 +-- src/ElmSharp.Wearable/ElmSharp.Wearable.csproj | 2 +- src/ElmSharp/ElmSharp.csproj | 2 +- .../Tizen.Account.AccountManager.csproj | 2 +- .../Tizen.Account.FidoClient.csproj | 2 +- .../Tizen.Account.OAuth2.csproj | 2 +- .../Tizen.Account.SyncManager.csproj | 2 +- .../Tizen.Applications.Alarm.csproj | 2 +- .../Tizen.Applications.AttachPanel.csproj | 2 +- .../Tizen.Applications.Badge.csproj | 2 +- .../Tizen.Applications.Common.csproj | 2 +- .../Tizen.Applications.DataControl.csproj | 7 +-- .../Tizen.Applications.MessagePort.csproj | 2 +- .../Tizen.Applications.Notification.csproj | 2 +- ...n.Applications.NotificationEventListener.csproj | 2 +- .../Tizen.Applications.PackageManager.csproj | 2 +- .../Tizen.Applications.Preference.csproj | 2 +- .../Tizen.Applications.RemoteView.csproj | 2 +- .../Tizen.Applications.Service.csproj | 2 +- .../Tizen.Applications.Shortcut.csproj | 2 +- .../Tizen.Applications.ToastMessage.csproj | 2 +- .../Tizen.Applications.UI.csproj | 2 +- .../Tizen.Applications.WatchApplication.csproj | 2 +- .../Tizen.Applications.WidgetApplication.csproj | 2 +- .../Tizen.Applications.WidgetControl.csproj | 2 +- src/Tizen.CallManager/Tizen.CallManager.csproj | 2 +- .../Tizen.Content.Download.csproj | 2 +- .../Tizen.Content.MediaContent.csproj | 2 +- .../Tizen.Content.MimeType.csproj | 2 +- src/Tizen.Context/Tizen.Context.csproj | 2 +- src/Tizen.Convergence/Tizen.Convergence.csproj | 2 +- .../Tizen.Location.Geofence.csproj | 2 +- src/Tizen.Location/Tizen.Location.csproj | 2 +- src/Tizen.Log/Tizen.Log.csproj | 2 +- src/Tizen.Maps/Tizen.Maps.csproj | 6 +-- .../Tizen.Messaging.Push.csproj | 2 +- src/Tizen.Messaging/Tizen.Messaging.csproj | 2 +- .../Tizen.Multimedia.AudioIO.csproj | 2 +- .../Tizen.Multimedia.Camera.csproj | 2 +- .../Tizen.Multimedia.MediaCodec.csproj | 2 +- .../Tizen.Multimedia.MediaPlayer.csproj | 2 +- .../Tizen.Multimedia.Metadata.csproj | 2 +- .../Tizen.Multimedia.Radio.csproj | 2 +- .../Tizen.Multimedia.Recorder.csproj | 2 +- .../Tizen.Multimedia.Remoting.csproj | 2 +- .../Tizen.Multimedia.StreamRecorder.csproj | 2 +- .../Tizen.Multimedia.Util.csproj | 2 +- .../Tizen.Multimedia.Vision.csproj | 2 +- src/Tizen.Multimedia/Tizen.Multimedia.csproj | 2 +- src/Tizen.NUI/Tizen.NUI.csproj | 6 +-- .../src/internal/dotnetcore/AddedException.cs | 54 -------------------- src/Tizen.NUI/src/internal/dotnetcore/HandleRef.cs | 55 -------------------- .../Tizen.Network.Bluetooth.csproj | 2 +- .../Tizen.Network.Connection.csproj | 2 +- .../Tizen.Network.IoTConnectivity.csproj | 2 +- src/Tizen.Network.Mtp/Tizen.Network.Mtp.csproj | 2 +- src/Tizen.Network.Nfc/Tizen.Network.Nfc.csproj | 2 +- src/Tizen.Network.Nsd/Tizen.Network.Nsd.csproj | 2 +- .../Tizen.Network.Smartcard.csproj | 2 +- src/Tizen.Network.WiFi/Tizen.Network.WiFi.csproj | 2 +- .../Tizen.Network.WiFiDirect.csproj | 6 +-- .../Tizen.PhonenumberUtils.csproj | 2 +- src/Tizen.Pims.Calendar/Tizen.Pims.Calendar.csproj | 2 +- src/Tizen.Pims.Contacts/Tizen.Pims.Contacts.csproj | 2 +- .../Tizen.Security.SecureRepository.csproj | 2 +- src/Tizen.Security.TEEC/Tizen.Security.TEEC.csproj | 2 +- src/Tizen.Security/Tizen.Security.csproj | 2 +- src/Tizen.Sensor/Tizen.Sensor.csproj | 2 +- .../Tizen.System.Feedback.csproj | 2 +- .../Tizen.System.Information.csproj | 2 +- .../Tizen.System.MediaKey.csproj | 2 +- .../Tizen.System.PlatformConfig.csproj | 2 +- .../Tizen.System.Storage.csproj | 2 +- .../Tizen.System.SystemSettings.csproj | 2 +- src/Tizen.System/Tizen.System.csproj | 2 +- src/Tizen.Tapi/Tizen.Tapi.csproj | 2 +- src/Tizen.Telephony/Tizen.Telephony.csproj | 2 +- src/Tizen.Tracer/Tizen.Tracer.csproj | 2 +- .../Tizen.Uix.InputMethod.csproj | 2 +- .../Tizen.Uix.InputMethodManager.csproj | 2 +- src/Tizen.Uix.Stt/Tizen.Uix.Stt.csproj | 2 +- src/Tizen.Uix.SttEngine/Tizen.Uix.SttEngine.csproj | 2 +- src/Tizen.Uix.Tts/Tizen.Uix.Tts.csproj | 2 +- src/Tizen.Uix.TtsEngine/Tizen.Uix.TtsEngine.csproj | 2 +- .../Tizen.Uix.VoiceControl.csproj | 2 +- src/Tizen.WebView/Tizen.WebView.csproj | 2 +- src/Tizen/Tizen.csproj | 2 +- tools/module.csproj.template | 2 +- tools/retry.sh | 21 ++++++++ tools/timeout.sh | 58 ++++++++++++++++++++++ 97 files changed, 186 insertions(+), 250 deletions(-) delete mode 100644 build/dependencies.props delete mode 100755 src/Tizen.NUI/src/internal/dotnetcore/AddedException.cs delete mode 100755 src/Tizen.NUI/src/internal/dotnetcore/HandleRef.cs create mode 100755 tools/retry.sh create mode 100755 tools/timeout.sh diff --git a/build.sh b/build.sh index 7adf108..359af21 100755 --- a/build.sh +++ b/build.sh @@ -7,9 +7,15 @@ SCRIPT_DIR=$(dirname $SCRIPT_FILE) OUTDIR=$SCRIPT_DIR/Artifacts NUGET_CMD="mono $SCRIPT_DIR/tools/NuGet.exe" -MSBUILD_CMD="dotnet msbuild" -RUN_BUILD="$MSBUILD_CMD $SCRIPT_DIR/build/build.proj" +RETRY_CMD="$SCRIPT_DIR/tools/retry.sh" +TIMEOUT_CMD="$SCRIPT_DIR/tools/timeout.sh" + +DOTNET_CMD="$RETRY_CMD $TIMEOUT_CMD 600 dotnet" + +RUN_BUILD="$DOTNET_CMD msbuild $SCRIPT_DIR/build/build.proj" +RUN_BUILD_DUMMY="$DOTNET_CMD build $SCRIPT_DIR/build/build.dummy.csproj" + usage() { echo "Usage: $0 [options] [args]" @@ -59,7 +65,7 @@ cmd_dummy_build() { if [ -d /nuget ]; then NUGET_SOURCE_OPT="/p:RestoreSources=/nuget" fi - $RUN_BUILD /t:builddummy $NUGET_SOURCE_OPT + $RUN_BUILD_DUMMY $NUGET_SOURCE_OPT } OPTS=`getopt -o hcbfpd --long help,clean,build,full,pack,dummy -n 'build' -- "$@"` diff --git a/build/build.dummy.csproj b/build/build.dummy.csproj index 264b527..47e3934 100644 --- a/build/build.dummy.csproj +++ b/build/build.dummy.csproj @@ -6,10 +6,9 @@ - netstandard1.6 + netstandard2.0 false $(VersionPrefix) - $(OutputBaseDir)obj\ $(OutputDummyDir) @@ -36,7 +35,7 @@ - + @@ -115,6 +114,7 @@ + diff --git a/build/build.proj b/build/build.proj index dc1f4bf..58e76f8 100644 --- a/build/build.proj +++ b/build/build.proj @@ -5,7 +5,6 @@ $(PackageSrcDir)PublicModuleList.txt - $(MSBuildThisFileDirectory)build.dummy.csproj @@ -81,17 +80,4 @@ - - - - - - - diff --git a/build/common.props b/build/common.props index 3df5a74..563ffc1 100644 --- a/build/common.props +++ b/build/common.props @@ -15,6 +15,4 @@ - - diff --git a/build/dependencies.props b/build/dependencies.props deleted file mode 100644 index cbab6eb..0000000 --- a/build/dependencies.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - 4.3.0 - - - \ No newline at end of file diff --git a/packaging/csapi-tizenfx.spec b/packaging/csapi-tizenfx.spec index 8cac95e..6cf322c 100644 --- 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.183 +Version: 4.0.0.184 Release: 1 Group: Development/Libraries License: Apache-2.0 diff --git a/pkg/Tizen.NET.Private.nuspec b/pkg/Tizen.NET.Private.nuspec index e364410..0c31525 100644 --- a/pkg/Tizen.NET.Private.nuspec +++ b/pkg/Tizen.NET.Private.nuspec @@ -16,13 +16,13 @@ - - - + + + - - - + + + diff --git a/pkg/Tizen.NET.nuspec b/pkg/Tizen.NET.nuspec index 24b9ce1..18f462b 100644 --- a/pkg/Tizen.NET.nuspec +++ b/pkg/Tizen.NET.nuspec @@ -20,9 +20,9 @@ Please edit pkg/PublicModuleList.txt, if want to add modules to Tizen.NET package. --> - - - + + + diff --git a/src/ElmSharp.Wearable/ElmSharp.Wearable.csproj b/src/ElmSharp.Wearable/ElmSharp.Wearable.csproj index fb34d39..da8d3f6 100644 --- a/src/ElmSharp.Wearable/ElmSharp.Wearable.csproj +++ b/src/ElmSharp.Wearable/ElmSharp.Wearable.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/ElmSharp/ElmSharp.csproj b/src/ElmSharp/ElmSharp.csproj index e73da10..dbdcea4 100644 --- a/src/ElmSharp/ElmSharp.csproj +++ b/src/ElmSharp/ElmSharp.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Account.AccountManager/Tizen.Account.AccountManager.csproj b/src/Tizen.Account.AccountManager/Tizen.Account.AccountManager.csproj index 11cd4a8..7f4584f 100644 --- a/src/Tizen.Account.AccountManager/Tizen.Account.AccountManager.csproj +++ b/src/Tizen.Account.AccountManager/Tizen.Account.AccountManager.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Account.FidoClient/Tizen.Account.FidoClient.csproj b/src/Tizen.Account.FidoClient/Tizen.Account.FidoClient.csproj index 11cd4a8..7f4584f 100644 --- a/src/Tizen.Account.FidoClient/Tizen.Account.FidoClient.csproj +++ b/src/Tizen.Account.FidoClient/Tizen.Account.FidoClient.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Account.OAuth2/Tizen.Account.OAuth2.csproj b/src/Tizen.Account.OAuth2/Tizen.Account.OAuth2.csproj index 11cd4a8..7f4584f 100644 --- a/src/Tizen.Account.OAuth2/Tizen.Account.OAuth2.csproj +++ b/src/Tizen.Account.OAuth2/Tizen.Account.OAuth2.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Account.SyncManager/Tizen.Account.SyncManager.csproj b/src/Tizen.Account.SyncManager/Tizen.Account.SyncManager.csproj index 8e139d2..af9c378 100644 --- a/src/Tizen.Account.SyncManager/Tizen.Account.SyncManager.csproj +++ b/src/Tizen.Account.SyncManager/Tizen.Account.SyncManager.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Applications.Alarm/Tizen.Applications.Alarm.csproj b/src/Tizen.Applications.Alarm/Tizen.Applications.Alarm.csproj index f4fddda..9c3d059 100755 --- a/src/Tizen.Applications.Alarm/Tizen.Applications.Alarm.csproj +++ b/src/Tizen.Applications.Alarm/Tizen.Applications.Alarm.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Applications.AttachPanel/Tizen.Applications.AttachPanel.csproj b/src/Tizen.Applications.AttachPanel/Tizen.Applications.AttachPanel.csproj index 8ab0f70..020b2cb 100755 --- a/src/Tizen.Applications.AttachPanel/Tizen.Applications.AttachPanel.csproj +++ b/src/Tizen.Applications.AttachPanel/Tizen.Applications.AttachPanel.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Applications.Badge/Tizen.Applications.Badge.csproj b/src/Tizen.Applications.Badge/Tizen.Applications.Badge.csproj index 11cd4a8..7f4584f 100755 --- a/src/Tizen.Applications.Badge/Tizen.Applications.Badge.csproj +++ b/src/Tizen.Applications.Badge/Tizen.Applications.Badge.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Applications.Common/Tizen.Applications.Common.csproj b/src/Tizen.Applications.Common/Tizen.Applications.Common.csproj index 11cd4a8..7f4584f 100755 --- a/src/Tizen.Applications.Common/Tizen.Applications.Common.csproj +++ b/src/Tizen.Applications.Common/Tizen.Applications.Common.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Applications.DataControl/Tizen.Applications.DataControl.csproj b/src/Tizen.Applications.DataControl/Tizen.Applications.DataControl.csproj index 82cc77f..020b2cb 100644 --- a/src/Tizen.Applications.DataControl/Tizen.Applications.DataControl.csproj +++ b/src/Tizen.Applications.DataControl/Tizen.Applications.DataControl.csproj @@ -1,16 +1,11 @@  - netstandard1.6 + netstandard2.0 - - - - - diff --git a/src/Tizen.Applications.MessagePort/Tizen.Applications.MessagePort.csproj b/src/Tizen.Applications.MessagePort/Tizen.Applications.MessagePort.csproj index 8ab0f70..020b2cb 100755 --- a/src/Tizen.Applications.MessagePort/Tizen.Applications.MessagePort.csproj +++ b/src/Tizen.Applications.MessagePort/Tizen.Applications.MessagePort.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Applications.Notification/Tizen.Applications.Notification.csproj b/src/Tizen.Applications.Notification/Tizen.Applications.Notification.csproj index 8ab0f70..020b2cb 100755 --- a/src/Tizen.Applications.Notification/Tizen.Applications.Notification.csproj +++ b/src/Tizen.Applications.Notification/Tizen.Applications.Notification.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Applications.NotificationEventListener/Tizen.Applications.NotificationEventListener.csproj b/src/Tizen.Applications.NotificationEventListener/Tizen.Applications.NotificationEventListener.csproj index 8ab0f70..020b2cb 100755 --- a/src/Tizen.Applications.NotificationEventListener/Tizen.Applications.NotificationEventListener.csproj +++ b/src/Tizen.Applications.NotificationEventListener/Tizen.Applications.NotificationEventListener.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Applications.PackageManager/Tizen.Applications.PackageManager.csproj b/src/Tizen.Applications.PackageManager/Tizen.Applications.PackageManager.csproj index 8ab0f70..020b2cb 100755 --- a/src/Tizen.Applications.PackageManager/Tizen.Applications.PackageManager.csproj +++ b/src/Tizen.Applications.PackageManager/Tizen.Applications.PackageManager.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Applications.Preference/Tizen.Applications.Preference.csproj b/src/Tizen.Applications.Preference/Tizen.Applications.Preference.csproj index 11cd4a8..7f4584f 100755 --- a/src/Tizen.Applications.Preference/Tizen.Applications.Preference.csproj +++ b/src/Tizen.Applications.Preference/Tizen.Applications.Preference.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Applications.RemoteView/Tizen.Applications.RemoteView.csproj b/src/Tizen.Applications.RemoteView/Tizen.Applications.RemoteView.csproj index b1c6a54..f47359d 100644 --- a/src/Tizen.Applications.RemoteView/Tizen.Applications.RemoteView.csproj +++ b/src/Tizen.Applications.RemoteView/Tizen.Applications.RemoteView.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Applications.Service/Tizen.Applications.Service.csproj b/src/Tizen.Applications.Service/Tizen.Applications.Service.csproj index 8ab0f70..020b2cb 100755 --- a/src/Tizen.Applications.Service/Tizen.Applications.Service.csproj +++ b/src/Tizen.Applications.Service/Tizen.Applications.Service.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Applications.Shortcut/Tizen.Applications.Shortcut.csproj b/src/Tizen.Applications.Shortcut/Tizen.Applications.Shortcut.csproj index fe6ff34..1407501 100644 --- a/src/Tizen.Applications.Shortcut/Tizen.Applications.Shortcut.csproj +++ b/src/Tizen.Applications.Shortcut/Tizen.Applications.Shortcut.csproj @@ -1,7 +1,7 @@ - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Applications.ToastMessage/Tizen.Applications.ToastMessage.csproj b/src/Tizen.Applications.ToastMessage/Tizen.Applications.ToastMessage.csproj index 8ab0f70..020b2cb 100755 --- a/src/Tizen.Applications.ToastMessage/Tizen.Applications.ToastMessage.csproj +++ b/src/Tizen.Applications.ToastMessage/Tizen.Applications.ToastMessage.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Applications.UI/Tizen.Applications.UI.csproj b/src/Tizen.Applications.UI/Tizen.Applications.UI.csproj index 8ab0f70..020b2cb 100755 --- a/src/Tizen.Applications.UI/Tizen.Applications.UI.csproj +++ b/src/Tizen.Applications.UI/Tizen.Applications.UI.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Applications.WatchApplication/Tizen.Applications.WatchApplication.csproj b/src/Tizen.Applications.WatchApplication/Tizen.Applications.WatchApplication.csproj index 4136f6c..e56b74e 100644 --- a/src/Tizen.Applications.WatchApplication/Tizen.Applications.WatchApplication.csproj +++ b/src/Tizen.Applications.WatchApplication/Tizen.Applications.WatchApplication.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.csproj b/src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.csproj index 4136f6c..e56b74e 100644 --- a/src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.csproj +++ b/src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.csproj b/src/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.csproj index 8ab0f70..020b2cb 100644 --- a/src/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.csproj +++ b/src/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.CallManager/Tizen.CallManager.csproj b/src/Tizen.CallManager/Tizen.CallManager.csproj index 11cd4a8..7f4584f 100644 --- a/src/Tizen.CallManager/Tizen.CallManager.csproj +++ b/src/Tizen.CallManager/Tizen.CallManager.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Content.Download/Tizen.Content.Download.csproj b/src/Tizen.Content.Download/Tizen.Content.Download.csproj index 8ab0f70..020b2cb 100644 --- a/src/Tizen.Content.Download/Tizen.Content.Download.csproj +++ b/src/Tizen.Content.Download/Tizen.Content.Download.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent.csproj b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent.csproj index 836f096..fbac841 100644 --- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent.csproj +++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Content.MimeType/Tizen.Content.MimeType.csproj b/src/Tizen.Content.MimeType/Tizen.Content.MimeType.csproj index 11cd4a8..7f4584f 100644 --- a/src/Tizen.Content.MimeType/Tizen.Content.MimeType.csproj +++ b/src/Tizen.Content.MimeType/Tizen.Content.MimeType.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Context/Tizen.Context.csproj b/src/Tizen.Context/Tizen.Context.csproj index 11cd4a8..7f4584f 100644 --- a/src/Tizen.Context/Tizen.Context.csproj +++ b/src/Tizen.Context/Tizen.Context.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Convergence/Tizen.Convergence.csproj b/src/Tizen.Convergence/Tizen.Convergence.csproj index 11cd4a8..7f4584f 100644 --- a/src/Tizen.Convergence/Tizen.Convergence.csproj +++ b/src/Tizen.Convergence/Tizen.Convergence.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Location.Geofence/Tizen.Location.Geofence.csproj b/src/Tizen.Location.Geofence/Tizen.Location.Geofence.csproj index 11cd4a8..7f4584f 100644 --- a/src/Tizen.Location.Geofence/Tizen.Location.Geofence.csproj +++ b/src/Tizen.Location.Geofence/Tizen.Location.Geofence.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Location/Tizen.Location.csproj b/src/Tizen.Location/Tizen.Location.csproj index 11cd4a8..7f4584f 100644 --- a/src/Tizen.Location/Tizen.Location.csproj +++ b/src/Tizen.Location/Tizen.Location.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Log/Tizen.Log.csproj b/src/Tizen.Log/Tizen.Log.csproj index e73da10..dbdcea4 100644 --- a/src/Tizen.Log/Tizen.Log.csproj +++ b/src/Tizen.Log/Tizen.Log.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Maps/Tizen.Maps.csproj b/src/Tizen.Maps/Tizen.Maps.csproj index 3bd4eaf..ae92048 100644 --- a/src/Tizen.Maps/Tizen.Maps.csproj +++ b/src/Tizen.Maps/Tizen.Maps.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 @@ -11,10 +11,6 @@ - - - - PreserveNewest diff --git a/src/Tizen.Messaging.Push/Tizen.Messaging.Push.csproj b/src/Tizen.Messaging.Push/Tizen.Messaging.Push.csproj index 11cd4a8..7f4584f 100644 --- a/src/Tizen.Messaging.Push/Tizen.Messaging.Push.csproj +++ b/src/Tizen.Messaging.Push/Tizen.Messaging.Push.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Messaging/Tizen.Messaging.csproj b/src/Tizen.Messaging/Tizen.Messaging.csproj index 11cd4a8..7f4584f 100644 --- a/src/Tizen.Messaging/Tizen.Messaging.csproj +++ b/src/Tizen.Messaging/Tizen.Messaging.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Multimedia.AudioIO/Tizen.Multimedia.AudioIO.csproj b/src/Tizen.Multimedia.AudioIO/Tizen.Multimedia.AudioIO.csproj index dec532e..ec9bff7 100644 --- a/src/Tizen.Multimedia.AudioIO/Tizen.Multimedia.AudioIO.csproj +++ b/src/Tizen.Multimedia.AudioIO/Tizen.Multimedia.AudioIO.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Multimedia.Camera/Tizen.Multimedia.Camera.csproj b/src/Tizen.Multimedia.Camera/Tizen.Multimedia.Camera.csproj index dec532e..ec9bff7 100644 --- a/src/Tizen.Multimedia.Camera/Tizen.Multimedia.Camera.csproj +++ b/src/Tizen.Multimedia.Camera/Tizen.Multimedia.Camera.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Multimedia.MediaCodec/Tizen.Multimedia.MediaCodec.csproj b/src/Tizen.Multimedia.MediaCodec/Tizen.Multimedia.MediaCodec.csproj index dec532e..ec9bff7 100644 --- a/src/Tizen.Multimedia.MediaCodec/Tizen.Multimedia.MediaCodec.csproj +++ b/src/Tizen.Multimedia.MediaCodec/Tizen.Multimedia.MediaCodec.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Multimedia.MediaPlayer/Tizen.Multimedia.MediaPlayer.csproj b/src/Tizen.Multimedia.MediaPlayer/Tizen.Multimedia.MediaPlayer.csproj index dec532e..ec9bff7 100644 --- a/src/Tizen.Multimedia.MediaPlayer/Tizen.Multimedia.MediaPlayer.csproj +++ b/src/Tizen.Multimedia.MediaPlayer/Tizen.Multimedia.MediaPlayer.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Multimedia.Metadata/Tizen.Multimedia.Metadata.csproj b/src/Tizen.Multimedia.Metadata/Tizen.Multimedia.Metadata.csproj index dec532e..ec9bff7 100644 --- a/src/Tizen.Multimedia.Metadata/Tizen.Multimedia.Metadata.csproj +++ b/src/Tizen.Multimedia.Metadata/Tizen.Multimedia.Metadata.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Multimedia.Radio/Tizen.Multimedia.Radio.csproj b/src/Tizen.Multimedia.Radio/Tizen.Multimedia.Radio.csproj index d9f42fb..8d4fb31 100644 --- a/src/Tizen.Multimedia.Radio/Tizen.Multimedia.Radio.csproj +++ b/src/Tizen.Multimedia.Radio/Tizen.Multimedia.Radio.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Multimedia.Recorder/Tizen.Multimedia.Recorder.csproj b/src/Tizen.Multimedia.Recorder/Tizen.Multimedia.Recorder.csproj index 4731ceb..bd01a3b 100644 --- a/src/Tizen.Multimedia.Recorder/Tizen.Multimedia.Recorder.csproj +++ b/src/Tizen.Multimedia.Recorder/Tizen.Multimedia.Recorder.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Multimedia.Remoting/Tizen.Multimedia.Remoting.csproj b/src/Tizen.Multimedia.Remoting/Tizen.Multimedia.Remoting.csproj index dec532e..ec9bff7 100644 --- a/src/Tizen.Multimedia.Remoting/Tizen.Multimedia.Remoting.csproj +++ b/src/Tizen.Multimedia.Remoting/Tizen.Multimedia.Remoting.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Multimedia.StreamRecorder/Tizen.Multimedia.StreamRecorder.csproj b/src/Tizen.Multimedia.StreamRecorder/Tizen.Multimedia.StreamRecorder.csproj index 82dec4d..9b8e9e6 100644 --- a/src/Tizen.Multimedia.StreamRecorder/Tizen.Multimedia.StreamRecorder.csproj +++ b/src/Tizen.Multimedia.StreamRecorder/Tizen.Multimedia.StreamRecorder.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Multimedia.Util/Tizen.Multimedia.Util.csproj b/src/Tizen.Multimedia.Util/Tizen.Multimedia.Util.csproj index dec532e..ec9bff7 100644 --- a/src/Tizen.Multimedia.Util/Tizen.Multimedia.Util.csproj +++ b/src/Tizen.Multimedia.Util/Tizen.Multimedia.Util.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Multimedia.Vision/Tizen.Multimedia.Vision.csproj b/src/Tizen.Multimedia.Vision/Tizen.Multimedia.Vision.csproj index dec532e..ec9bff7 100644 --- a/src/Tizen.Multimedia.Vision/Tizen.Multimedia.Vision.csproj +++ b/src/Tizen.Multimedia.Vision/Tizen.Multimedia.Vision.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Multimedia/Tizen.Multimedia.csproj b/src/Tizen.Multimedia/Tizen.Multimedia.csproj index fd0854a..3b5598e 100644 --- a/src/Tizen.Multimedia/Tizen.Multimedia.csproj +++ b/src/Tizen.Multimedia/Tizen.Multimedia.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.NUI/Tizen.NUI.csproj b/src/Tizen.NUI/Tizen.NUI.csproj index 53c7e3d..22cb378 100755 --- a/src/Tizen.NUI/Tizen.NUI.csproj +++ b/src/Tizen.NUI/Tizen.NUI.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 $(DefineConstants);DEBUG_ON @@ -10,10 +10,6 @@ - - - - diff --git a/src/Tizen.NUI/src/internal/dotnetcore/AddedException.cs b/src/Tizen.NUI/src/internal/dotnetcore/AddedException.cs deleted file mode 100755 index 01525ed..0000000 --- a/src/Tizen.NUI/src/internal/dotnetcore/AddedException.cs +++ /dev/null @@ -1,54 +0,0 @@ -/** Copyright (c) 2017 Samsung Electronics Co., Ltd. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -*/ - -namespace System -{ - public class ApplicationException : Exception - { - public ApplicationException(): base() - { - //add anything required - } - - public ApplicationException(string message): base(message) - { - //add anything required - } - - public ApplicationException(string message, Exception innerException): base(message, innerException) - { - //add anything required - } - } - - public class SystemException : Exception - { - public SystemException(): base() - { - //add anything required - } - - public SystemException(string message): base(message) - { - //add anything required - } - - public SystemException(string message, Exception innerException): base(message, innerException) - { - //add anything required - } - } -} diff --git a/src/Tizen.NUI/src/internal/dotnetcore/HandleRef.cs b/src/Tizen.NUI/src/internal/dotnetcore/HandleRef.cs deleted file mode 100755 index db34d4a..0000000 --- a/src/Tizen.NUI/src/internal/dotnetcore/HandleRef.cs +++ /dev/null @@ -1,55 +0,0 @@ -// ==++== -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// -// ==--== -namespace System.Runtime.InteropServices -{ - - using System; - - [System.Runtime.InteropServices.ComVisible(true)] - public struct HandleRef - { - - // ! Do not add or rearrange fields as the EE depends on this layout. - //------------------------------------------------------------------ - internal Object m_wrapper; - internal IntPtr m_handle; - //------------------------------------------------------------------ - - - public HandleRef(Object wrapper, IntPtr handle) - { - m_wrapper = wrapper; - m_handle = handle; - } - - public Object Wrapper - { - get - { - return m_wrapper; - } - } - - public IntPtr Handle - { - get - { - return m_handle; - } - } - - - public static explicit operator IntPtr(HandleRef value) - { - return value.m_handle; - } - - public static IntPtr ToIntPtr(HandleRef value) - { - return value.m_handle; - } - } -} diff --git a/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth.csproj b/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth.csproj index 3cc4118..348907f 100644 --- a/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth.csproj +++ b/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Network.Connection/Tizen.Network.Connection.csproj b/src/Tizen.Network.Connection/Tizen.Network.Connection.csproj index 11cd4a8..7f4584f 100644 --- a/src/Tizen.Network.Connection/Tizen.Network.Connection.csproj +++ b/src/Tizen.Network.Connection/Tizen.Network.Connection.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.csproj b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.csproj index 11cd4a8..7f4584f 100644 --- a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.csproj +++ b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Network.Mtp/Tizen.Network.Mtp.csproj b/src/Tizen.Network.Mtp/Tizen.Network.Mtp.csproj index 11cd4a8..7f4584f 100644 --- a/src/Tizen.Network.Mtp/Tizen.Network.Mtp.csproj +++ b/src/Tizen.Network.Mtp/Tizen.Network.Mtp.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Network.Nfc/Tizen.Network.Nfc.csproj b/src/Tizen.Network.Nfc/Tizen.Network.Nfc.csproj index dd1bde7..aeeef3f 100644 --- a/src/Tizen.Network.Nfc/Tizen.Network.Nfc.csproj +++ b/src/Tizen.Network.Nfc/Tizen.Network.Nfc.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Network.Nsd/Tizen.Network.Nsd.csproj b/src/Tizen.Network.Nsd/Tizen.Network.Nsd.csproj index 11cd4a8..7f4584f 100644 --- a/src/Tizen.Network.Nsd/Tizen.Network.Nsd.csproj +++ b/src/Tizen.Network.Nsd/Tizen.Network.Nsd.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard.csproj b/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard.csproj index 11cd4a8..7f4584f 100644 --- a/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard.csproj +++ b/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Network.WiFi/Tizen.Network.WiFi.csproj b/src/Tizen.Network.WiFi/Tizen.Network.WiFi.csproj index 819343d..b3b1ca1 100644 --- a/src/Tizen.Network.WiFi/Tizen.Network.WiFi.csproj +++ b/src/Tizen.Network.WiFi/Tizen.Network.WiFi.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Network.WiFiDirect/Tizen.Network.WiFiDirect.csproj b/src/Tizen.Network.WiFiDirect/Tizen.Network.WiFiDirect.csproj index cda3b93..4c51c41 100644 --- a/src/Tizen.Network.WiFiDirect/Tizen.Network.WiFiDirect.csproj +++ b/src/Tizen.Network.WiFiDirect/Tizen.Network.WiFiDirect.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 @@ -9,8 +9,4 @@ - - - - \ No newline at end of file diff --git a/src/Tizen.PhonenumberUtils/Tizen.PhonenumberUtils.csproj b/src/Tizen.PhonenumberUtils/Tizen.PhonenumberUtils.csproj index 11cd4a8..7f4584f 100644 --- a/src/Tizen.PhonenumberUtils/Tizen.PhonenumberUtils.csproj +++ b/src/Tizen.PhonenumberUtils/Tizen.PhonenumberUtils.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Pims.Calendar/Tizen.Pims.Calendar.csproj b/src/Tizen.Pims.Calendar/Tizen.Pims.Calendar.csproj index 11cd4a8..7f4584f 100644 --- a/src/Tizen.Pims.Calendar/Tizen.Pims.Calendar.csproj +++ b/src/Tizen.Pims.Calendar/Tizen.Pims.Calendar.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Pims.Contacts/Tizen.Pims.Contacts.csproj b/src/Tizen.Pims.Contacts/Tizen.Pims.Contacts.csproj index 45ee828..4c51c41 100644 --- a/src/Tizen.Pims.Contacts/Tizen.Pims.Contacts.csproj +++ b/src/Tizen.Pims.Contacts/Tizen.Pims.Contacts.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.csproj b/src/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.csproj index 45ee828..4c51c41 100644 --- a/src/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.csproj +++ b/src/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Security.TEEC/Tizen.Security.TEEC.csproj b/src/Tizen.Security.TEEC/Tizen.Security.TEEC.csproj index 45ee828..4c51c41 100644 --- a/src/Tizen.Security.TEEC/Tizen.Security.TEEC.csproj +++ b/src/Tizen.Security.TEEC/Tizen.Security.TEEC.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Security/Tizen.Security.csproj b/src/Tizen.Security/Tizen.Security.csproj index 922c310..eec4f4a 100644 --- a/src/Tizen.Security/Tizen.Security.csproj +++ b/src/Tizen.Security/Tizen.Security.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Sensor/Tizen.Sensor.csproj b/src/Tizen.Sensor/Tizen.Sensor.csproj index 3cc4118..348907f 100644 --- a/src/Tizen.Sensor/Tizen.Sensor.csproj +++ b/src/Tizen.Sensor/Tizen.Sensor.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.System.Feedback/Tizen.System.Feedback.csproj b/src/Tizen.System.Feedback/Tizen.System.Feedback.csproj index 45ee828..4c51c41 100644 --- a/src/Tizen.System.Feedback/Tizen.System.Feedback.csproj +++ b/src/Tizen.System.Feedback/Tizen.System.Feedback.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.System.Information/Tizen.System.Information.csproj b/src/Tizen.System.Information/Tizen.System.Information.csproj index 11cd4a8..7f4584f 100644 --- a/src/Tizen.System.Information/Tizen.System.Information.csproj +++ b/src/Tizen.System.Information/Tizen.System.Information.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.System.MediaKey/Tizen.System.MediaKey.csproj b/src/Tizen.System.MediaKey/Tizen.System.MediaKey.csproj index 45ee828..4c51c41 100644 --- a/src/Tizen.System.MediaKey/Tizen.System.MediaKey.csproj +++ b/src/Tizen.System.MediaKey/Tizen.System.MediaKey.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.System.PlatformConfig/Tizen.System.PlatformConfig.csproj b/src/Tizen.System.PlatformConfig/Tizen.System.PlatformConfig.csproj index 45ee828..4c51c41 100644 --- a/src/Tizen.System.PlatformConfig/Tizen.System.PlatformConfig.csproj +++ b/src/Tizen.System.PlatformConfig/Tizen.System.PlatformConfig.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.System.Storage/Tizen.System.Storage.csproj b/src/Tizen.System.Storage/Tizen.System.Storage.csproj index 45ee828..4c51c41 100644 --- a/src/Tizen.System.Storage/Tizen.System.Storage.csproj +++ b/src/Tizen.System.Storage/Tizen.System.Storage.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.System.SystemSettings/Tizen.System.SystemSettings.csproj b/src/Tizen.System.SystemSettings/Tizen.System.SystemSettings.csproj index 11cd4a8..7f4584f 100644 --- a/src/Tizen.System.SystemSettings/Tizen.System.SystemSettings.csproj +++ b/src/Tizen.System.SystemSettings/Tizen.System.SystemSettings.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.System/Tizen.System.csproj b/src/Tizen.System/Tizen.System.csproj index 45ee828..4c51c41 100644 --- a/src/Tizen.System/Tizen.System.csproj +++ b/src/Tizen.System/Tizen.System.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Tapi/Tizen.Tapi.csproj b/src/Tizen.Tapi/Tizen.Tapi.csproj index 45ee828..4c51c41 100644 --- a/src/Tizen.Tapi/Tizen.Tapi.csproj +++ b/src/Tizen.Tapi/Tizen.Tapi.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Telephony/Tizen.Telephony.csproj b/src/Tizen.Telephony/Tizen.Telephony.csproj index 45ee828..4c51c41 100644 --- a/src/Tizen.Telephony/Tizen.Telephony.csproj +++ b/src/Tizen.Telephony/Tizen.Telephony.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Tracer/Tizen.Tracer.csproj b/src/Tizen.Tracer/Tizen.Tracer.csproj index 45ee828..4c51c41 100644 --- a/src/Tizen.Tracer/Tizen.Tracer.csproj +++ b/src/Tizen.Tracer/Tizen.Tracer.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Uix.InputMethod/Tizen.Uix.InputMethod.csproj b/src/Tizen.Uix.InputMethod/Tizen.Uix.InputMethod.csproj index 895f913..973f027 100644 --- a/src/Tizen.Uix.InputMethod/Tizen.Uix.InputMethod.csproj +++ b/src/Tizen.Uix.InputMethod/Tizen.Uix.InputMethod.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Uix.InputMethodManager/Tizen.Uix.InputMethodManager.csproj b/src/Tizen.Uix.InputMethodManager/Tizen.Uix.InputMethodManager.csproj index 45ee828..4c51c41 100644 --- a/src/Tizen.Uix.InputMethodManager/Tizen.Uix.InputMethodManager.csproj +++ b/src/Tizen.Uix.InputMethodManager/Tizen.Uix.InputMethodManager.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Uix.Stt/Tizen.Uix.Stt.csproj b/src/Tizen.Uix.Stt/Tizen.Uix.Stt.csproj index 45ee828..4c51c41 100644 --- a/src/Tizen.Uix.Stt/Tizen.Uix.Stt.csproj +++ b/src/Tizen.Uix.Stt/Tizen.Uix.Stt.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Uix.SttEngine/Tizen.Uix.SttEngine.csproj b/src/Tizen.Uix.SttEngine/Tizen.Uix.SttEngine.csproj index 45ee828..4c51c41 100755 --- a/src/Tizen.Uix.SttEngine/Tizen.Uix.SttEngine.csproj +++ b/src/Tizen.Uix.SttEngine/Tizen.Uix.SttEngine.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Uix.Tts/Tizen.Uix.Tts.csproj b/src/Tizen.Uix.Tts/Tizen.Uix.Tts.csproj index 45ee828..4c51c41 100644 --- a/src/Tizen.Uix.Tts/Tizen.Uix.Tts.csproj +++ b/src/Tizen.Uix.Tts/Tizen.Uix.Tts.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Uix.TtsEngine/Tizen.Uix.TtsEngine.csproj b/src/Tizen.Uix.TtsEngine/Tizen.Uix.TtsEngine.csproj index 45ee828..4c51c41 100755 --- a/src/Tizen.Uix.TtsEngine/Tizen.Uix.TtsEngine.csproj +++ b/src/Tizen.Uix.TtsEngine/Tizen.Uix.TtsEngine.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.csproj b/src/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.csproj index 45ee828..4c51c41 100644 --- a/src/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.csproj +++ b/src/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen.WebView/Tizen.WebView.csproj b/src/Tizen.WebView/Tizen.WebView.csproj index ea3ba84..48e80f0 100644 --- a/src/Tizen.WebView/Tizen.WebView.csproj +++ b/src/Tizen.WebView/Tizen.WebView.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/src/Tizen/Tizen.csproj b/src/Tizen/Tizen.csproj index e73da10..dbdcea4 100644 --- a/src/Tizen/Tizen.csproj +++ b/src/Tizen/Tizen.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/tools/module.csproj.template b/tools/module.csproj.template index 2257110..30cd5a4 100644 --- a/tools/module.csproj.template +++ b/tools/module.csproj.template @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 diff --git a/tools/retry.sh b/tools/retry.sh new file mode 100755 index 0000000..b6add9d --- /dev/null +++ b/tools/retry.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +retry_count=3 +cmd="${@}" + +n=0 +until [ $n -ge $retry_count ]; do + if [ $n -gt 0 ]; then + echo "(Failed! Retry $[$n+1]/$retry_count) $cmd" + sleep 2 + fi + $cmd + RET=$? + if [ $RET -eq 0 ]; then + break + else + n=$[$n+1] + fi +done + +exit $RET diff --git a/tools/timeout.sh b/tools/timeout.sh new file mode 100755 index 0000000..c7273d0 --- /dev/null +++ b/tools/timeout.sh @@ -0,0 +1,58 @@ +#!/bin/sh + +# Execute a command with a timeout + +# License: LGPLv2 +# Author: +# http://www.pixelbeat.org/ +# Notes: +# Note there is a timeout command packaged with coreutils since v7.0 +# If the timeout occurs the exit status is 124. +# There is an asynchronous (and buggy) equivalent of this +# script packaged with bash (under /usr/share/doc/ in my distro), +# which I only noticed after writing this. +# I noticed later again that there is a C equivalent of this packaged +# with satan by Wietse Venema, and copied to forensics by Dan Farmer. +# Changes: +# V1.0, Nov 3 2006, Initial release +# V1.1, Nov 20 2007, Brad Greenlee +# Make more portable by using the 'CHLD' +# signal spec rather than 17. +# V1.3, Oct 29 2009, Ján Sáreník +# Even though this runs under dash,ksh etc. +# it doesn't actually timeout. So enforce bash for now. +# Also change exit on timeout from 128 to 124 +# to match coreutils. +# V2.0, Oct 30 2009, Ján Sáreník +# Rewritten to cover compatibility with other +# Bourne shell implementations (pdksh, dash) + +if [ "$#" -lt "2" ]; then + echo "Usage: `basename $0` timeout_in_seconds command" >&2 + echo "Example: `basename $0` 2 sleep 3 || echo timeout" >&2 + exit 1 +fi + +cleanup() +{ + trap - ALRM #reset handler to default + kill -ALRM $a 2>/dev/null #stop timer subshell if running + kill $! 2>/dev/null && #kill last job + exit 124 #exit with 124 if it was running +} + +watchit() +{ + trap "cleanup" ALRM + sleep $1& wait + kill -ALRM $$ +} + +watchit $1& a=$! #start the timeout +shift #first param was timeout for sleep +trap "cleanup" ALRM INT #cleanup after timeout +"$@"& wait $!; RET=$? #start the job wait for it and save its return value +kill -ALRM $a #send ALRM signal to watchit +wait $a #wait for watchit to finish cleanup +exit $RET #return the value + -- 2.7.4