Use NETStandard 2.0

Change-Id: Ia3a3c1209c5ea50d866c6958da1567e8c09b0a81

diff --git a/build.sh b/build.sh
index 7adf108..359af21 100755 (executable)
--- 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 (file)
--- a/build/build.dummy.csproj
+++ b/build/build.dummy.csproj
@@ -6,10 +6,9 @@
   <Import Project="$(MSBuildThisFileDirectory)version.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateDependencyFile>false</GenerateDependencyFile>
     <DummyAssemblyVersion>$(VersionPrefix)</DummyAssemblyVersion>
-    <BaseIntermediateOutputPath>$(OutputBaseDir)obj\</BaseIntermediateOutputPath>
     <OutDir>$(OutputDummyDir)</OutDir>
   </PropertyGroup>
 
@@ -36,7 +35,7 @@
   <Target Name="CopyFilesToOutputDirectory" />
 
   <!-- Target for preparing reference lib directory -->
-  <Target Name="Prepare">
+  <Target Name="Prepare" DependsOnTargets="ResolveAssemblyReferences">
     <ItemGroup>
       <ReferencePath Include="@(TizenAssemblies)" />
     </ItemGroup>
@@ -115,6 +114,7 @@
   </Target>
 
   <Target Name="AfterBuild" DependsOnTargets="Prepare;GenerateDummy">
+    <RemoveDir Directories="$(BaseIntermediateOutputPath)" />
   </Target>
 
 </Project>

diff --git a/build/build.proj b/build/build.proj
index dc1f4bf..58e76f8 100644 (file)
--- a/build/build.proj
+++ b/build/build.proj
@@ -5,7 +5,6 @@
   <!-- Common Properties -->
   <PropertyGroup>
     <PublicModuleListFile>$(PackageSrcDir)PublicModuleList.txt</PublicModuleListFile>
-    <DummyBuildProject>$(MSBuildThisFileDirectory)build.dummy.csproj</DummyBuildProject>
   </PropertyGroup>
 
   <!-- Build Properties -->
@@ -81,17 +80,4 @@
 
   </Target>
 
-  <!--
-    Target : BuildDummy
-    ===================
-    Build dummy assemblies using GenAPI
-  -->
-  <Target Name="BuildDummy">
-
-    <MSBuild Projects="$(DummyBuildProject)"
-             Properties="Configuration=$(Configuration);RestoreSources=$(RestoreSources)"
-             Targets="Restore;Rebuild" />
-
-  </Target>
-
 </Project>

diff --git a/build/common.props b/build/common.props
index 3df5a74..563ffc1 100644 (file)
--- a/build/common.props
+++ b/build/common.props
@@ -15,6 +15,4 @@
 
   <Import Project="$(MSBuildThisFileDirectory)version.props" />
 
-  <Import Project="$(MSBuildThisFileDirectory)dependencies.props" />
-
 </Project>

diff --git a/build/dependencies.props b/build/dependencies.props
deleted file mode 100644 (file)
index cbab6eb..0000000
--- a/build/dependencies.props
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <SystemPackageVersion>4.3.0</SystemPackageVersion>
-  </PropertyGroup>
-
-</Project>
\ No newline at end of file

diff --git a/pkg/Tizen.NET.Private.nuspec b/pkg/Tizen.NET.Private.nuspec
index e364410..0c31525 100644 (file)
--- a/pkg/Tizen.NET.Private.nuspec
+++ b/pkg/Tizen.NET.Private.nuspec
@@ -16,13 +16,13 @@
 
     <file src="pkg\build\**" target="build" />
 
-    <file src="Artifacts\bin\public\*.dll"  target="lib\netstandard1.6" />
-    <file src="Artifacts\bin\public\*.pdb"  target="lib\netstandard1.6" />
-    <file src="Artifacts\bin\public\*.xml"  target="lib\netstandard1.6" />
+    <file src="Artifacts\bin\public\*.dll"  target="lib\netstandard2.0" />
+    <file src="Artifacts\bin\public\*.pdb"  target="lib\netstandard2.0" />
+    <file src="Artifacts\bin\public\*.xml"  target="lib\netstandard2.0" />
 
-    <file src="Artifacts\bin\platform\*.dll"  target="lib\netstandard1.6" />
-    <file src="Artifacts\bin\platform\*.pdb"  target="lib\netstandard1.6" />
-    <file src="Artifacts\bin\platform\*.xml"  target="lib\netstandard1.6" />
+    <file src="Artifacts\bin\platform\*.dll"  target="lib\netstandard2.0" />
+    <file src="Artifacts\bin\platform\*.pdb"  target="lib\netstandard2.0" />
+    <file src="Artifacts\bin\platform\*.xml"  target="lib\netstandard2.0" />
 
   </files>
 </package>

diff --git a/pkg/Tizen.NET.nuspec b/pkg/Tizen.NET.nuspec
index 24b9ce1..18f462b 100644 (file)
--- 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.
     -->
-    <file src="Artifacts\bin\public\*.dll"  target="lib\netstandard1.6" />
-    <file src="Artifacts\bin\public\*.pdb"  target="lib\netstandard1.6" />
-    <file src="Artifacts\bin\public\*.xml"  target="lib\netstandard1.6" />
+    <file src="Artifacts\bin\public\*.dll"  target="lib\netstandard2.0" />
+    <file src="Artifacts\bin\public\*.pdb"  target="lib\netstandard2.0" />
+    <file src="Artifacts\bin\public\*.xml"  target="lib\netstandard2.0" />
 
   </files>
 </package>

diff --git a/src/ElmSharp.Wearable/ElmSharp.Wearable.csproj b/src/ElmSharp.Wearable/ElmSharp.Wearable.csproj
index fb34d39..da8d3f6 100644 (file)
--- a/src/ElmSharp.Wearable/ElmSharp.Wearable.csproj
+++ b/src/ElmSharp.Wearable/ElmSharp.Wearable.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/ElmSharp/ElmSharp.csproj b/src/ElmSharp/ElmSharp.csproj
index e73da10..dbdcea4 100644 (file)
--- a/src/ElmSharp/ElmSharp.csproj
+++ b/src/ElmSharp/ElmSharp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
 </Project>

diff --git a/src/Tizen.Account.AccountManager/Tizen.Account.AccountManager.csproj b/src/Tizen.Account.AccountManager/Tizen.Account.AccountManager.csproj
index 11cd4a8..7f4584f 100644 (file)
--- a/src/Tizen.Account.AccountManager/Tizen.Account.AccountManager.csproj
+++ b/src/Tizen.Account.AccountManager/Tizen.Account.AccountManager.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Account.FidoClient/Tizen.Account.FidoClient.csproj b/src/Tizen.Account.FidoClient/Tizen.Account.FidoClient.csproj
index 11cd4a8..7f4584f 100644 (file)
--- a/src/Tizen.Account.FidoClient/Tizen.Account.FidoClient.csproj
+++ b/src/Tizen.Account.FidoClient/Tizen.Account.FidoClient.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Account.OAuth2/Tizen.Account.OAuth2.csproj b/src/Tizen.Account.OAuth2/Tizen.Account.OAuth2.csproj
index 11cd4a8..7f4584f 100644 (file)
--- a/src/Tizen.Account.OAuth2/Tizen.Account.OAuth2.csproj
+++ b/src/Tizen.Account.OAuth2/Tizen.Account.OAuth2.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Account.SyncManager/Tizen.Account.SyncManager.csproj b/src/Tizen.Account.SyncManager/Tizen.Account.SyncManager.csproj
index 8e139d2..af9c378 100644 (file)
--- a/src/Tizen.Account.SyncManager/Tizen.Account.SyncManager.csproj
+++ b/src/Tizen.Account.SyncManager/Tizen.Account.SyncManager.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Applications.Alarm/Tizen.Applications.Alarm.csproj b/src/Tizen.Applications.Alarm/Tizen.Applications.Alarm.csproj
index f4fddda..9c3d059 100755 (executable)
--- a/src/Tizen.Applications.Alarm/Tizen.Applications.Alarm.csproj
+++ b/src/Tizen.Applications.Alarm/Tizen.Applications.Alarm.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Applications.AttachPanel/Tizen.Applications.AttachPanel.csproj b/src/Tizen.Applications.AttachPanel/Tizen.Applications.AttachPanel.csproj
index 8ab0f70..020b2cb 100755 (executable)
--- a/src/Tizen.Applications.AttachPanel/Tizen.Applications.AttachPanel.csproj
+++ b/src/Tizen.Applications.AttachPanel/Tizen.Applications.AttachPanel.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Applications.Badge/Tizen.Applications.Badge.csproj b/src/Tizen.Applications.Badge/Tizen.Applications.Badge.csproj
index 11cd4a8..7f4584f 100755 (executable)
--- a/src/Tizen.Applications.Badge/Tizen.Applications.Badge.csproj
+++ b/src/Tizen.Applications.Badge/Tizen.Applications.Badge.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Applications.Common/Tizen.Applications.Common.csproj b/src/Tizen.Applications.Common/Tizen.Applications.Common.csproj
index 11cd4a8..7f4584f 100755 (executable)
--- a/src/Tizen.Applications.Common/Tizen.Applications.Common.csproj
+++ b/src/Tizen.Applications.Common/Tizen.Applications.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Applications.DataControl/Tizen.Applications.DataControl.csproj b/src/Tizen.Applications.DataControl/Tizen.Applications.DataControl.csproj
index 82cc77f..020b2cb 100644 (file)
--- a/src/Tizen.Applications.DataControl/Tizen.Applications.DataControl.csproj
+++ b/src/Tizen.Applications.DataControl/Tizen.Applications.DataControl.csproj
@@ -1,16 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Tizen.Applications.Common\Tizen.Applications.Common.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="System.Diagnostics.Process" Version="$(SystemPackageVersion)" PrivateAssets="All" />
-    <PackageReference Include="System.Threading.Thread" Version="$(SystemPackageVersion)" PrivateAssets="All" />
-  </ItemGroup>
-
 </Project>

diff --git a/src/Tizen.Applications.MessagePort/Tizen.Applications.MessagePort.csproj b/src/Tizen.Applications.MessagePort/Tizen.Applications.MessagePort.csproj
index 8ab0f70..020b2cb 100755 (executable)
--- a/src/Tizen.Applications.MessagePort/Tizen.Applications.MessagePort.csproj
+++ b/src/Tizen.Applications.MessagePort/Tizen.Applications.MessagePort.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Applications.Notification/Tizen.Applications.Notification.csproj b/src/Tizen.Applications.Notification/Tizen.Applications.Notification.csproj
index 8ab0f70..020b2cb 100755 (executable)
--- a/src/Tizen.Applications.Notification/Tizen.Applications.Notification.csproj
+++ b/src/Tizen.Applications.Notification/Tizen.Applications.Notification.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Applications.NotificationEventListener/Tizen.Applications.NotificationEventListener.csproj b/src/Tizen.Applications.NotificationEventListener/Tizen.Applications.NotificationEventListener.csproj
index 8ab0f70..020b2cb 100755 (executable)
--- a/src/Tizen.Applications.NotificationEventListener/Tizen.Applications.NotificationEventListener.csproj
+++ b/src/Tizen.Applications.NotificationEventListener/Tizen.Applications.NotificationEventListener.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Applications.PackageManager/Tizen.Applications.PackageManager.csproj b/src/Tizen.Applications.PackageManager/Tizen.Applications.PackageManager.csproj
index 8ab0f70..020b2cb 100755 (executable)
--- a/src/Tizen.Applications.PackageManager/Tizen.Applications.PackageManager.csproj
+++ b/src/Tizen.Applications.PackageManager/Tizen.Applications.PackageManager.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Applications.Preference/Tizen.Applications.Preference.csproj b/src/Tizen.Applications.Preference/Tizen.Applications.Preference.csproj
index 11cd4a8..7f4584f 100755 (executable)
--- a/src/Tizen.Applications.Preference/Tizen.Applications.Preference.csproj
+++ b/src/Tizen.Applications.Preference/Tizen.Applications.Preference.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Applications.RemoteView/Tizen.Applications.RemoteView.csproj b/src/Tizen.Applications.RemoteView/Tizen.Applications.RemoteView.csproj
index b1c6a54..f47359d 100644 (file)
--- a/src/Tizen.Applications.RemoteView/Tizen.Applications.RemoteView.csproj
+++ b/src/Tizen.Applications.RemoteView/Tizen.Applications.RemoteView.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Applications.Service/Tizen.Applications.Service.csproj b/src/Tizen.Applications.Service/Tizen.Applications.Service.csproj
index 8ab0f70..020b2cb 100755 (executable)
--- a/src/Tizen.Applications.Service/Tizen.Applications.Service.csproj
+++ b/src/Tizen.Applications.Service/Tizen.Applications.Service.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Applications.Shortcut/Tizen.Applications.Shortcut.csproj b/src/Tizen.Applications.Shortcut/Tizen.Applications.Shortcut.csproj
index fe6ff34..1407501 100644 (file)
--- a/src/Tizen.Applications.Shortcut/Tizen.Applications.Shortcut.csproj
+++ b/src/Tizen.Applications.Shortcut/Tizen.Applications.Shortcut.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Applications.ToastMessage/Tizen.Applications.ToastMessage.csproj b/src/Tizen.Applications.ToastMessage/Tizen.Applications.ToastMessage.csproj
index 8ab0f70..020b2cb 100755 (executable)
--- a/src/Tizen.Applications.ToastMessage/Tizen.Applications.ToastMessage.csproj
+++ b/src/Tizen.Applications.ToastMessage/Tizen.Applications.ToastMessage.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Applications.UI/Tizen.Applications.UI.csproj b/src/Tizen.Applications.UI/Tizen.Applications.UI.csproj
index 8ab0f70..020b2cb 100755 (executable)
--- a/src/Tizen.Applications.UI/Tizen.Applications.UI.csproj
+++ b/src/Tizen.Applications.UI/Tizen.Applications.UI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Applications.WatchApplication/Tizen.Applications.WatchApplication.csproj b/src/Tizen.Applications.WatchApplication/Tizen.Applications.WatchApplication.csproj
index 4136f6c..e56b74e 100644 (file)
--- a/src/Tizen.Applications.WatchApplication/Tizen.Applications.WatchApplication.csproj
+++ b/src/Tizen.Applications.WatchApplication/Tizen.Applications.WatchApplication.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.csproj b/src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.csproj
index 4136f6c..e56b74e 100644 (file)
--- a/src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.csproj
+++ b/src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.csproj b/src/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.csproj
index 8ab0f70..020b2cb 100644 (file)
--- a/src/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.csproj
+++ b/src/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.CallManager/Tizen.CallManager.csproj b/src/Tizen.CallManager/Tizen.CallManager.csproj
index 11cd4a8..7f4584f 100644 (file)
--- a/src/Tizen.CallManager/Tizen.CallManager.csproj
+++ b/src/Tizen.CallManager/Tizen.CallManager.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Content.Download/Tizen.Content.Download.csproj b/src/Tizen.Content.Download/Tizen.Content.Download.csproj
index 8ab0f70..020b2cb 100644 (file)
--- a/src/Tizen.Content.Download/Tizen.Content.Download.csproj
+++ b/src/Tizen.Content.Download/Tizen.Content.Download.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent.csproj b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent.csproj
index 836f096..fbac841 100644 (file)
--- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent.csproj
+++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Content.MimeType/Tizen.Content.MimeType.csproj b/src/Tizen.Content.MimeType/Tizen.Content.MimeType.csproj
index 11cd4a8..7f4584f 100644 (file)
--- a/src/Tizen.Content.MimeType/Tizen.Content.MimeType.csproj
+++ b/src/Tizen.Content.MimeType/Tizen.Content.MimeType.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Context/Tizen.Context.csproj b/src/Tizen.Context/Tizen.Context.csproj
index 11cd4a8..7f4584f 100644 (file)
--- a/src/Tizen.Context/Tizen.Context.csproj
+++ b/src/Tizen.Context/Tizen.Context.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Convergence/Tizen.Convergence.csproj b/src/Tizen.Convergence/Tizen.Convergence.csproj
index 11cd4a8..7f4584f 100644 (file)
--- a/src/Tizen.Convergence/Tizen.Convergence.csproj
+++ b/src/Tizen.Convergence/Tizen.Convergence.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Location.Geofence/Tizen.Location.Geofence.csproj b/src/Tizen.Location.Geofence/Tizen.Location.Geofence.csproj
index 11cd4a8..7f4584f 100644 (file)
--- a/src/Tizen.Location.Geofence/Tizen.Location.Geofence.csproj
+++ b/src/Tizen.Location.Geofence/Tizen.Location.Geofence.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Location/Tizen.Location.csproj b/src/Tizen.Location/Tizen.Location.csproj
index 11cd4a8..7f4584f 100644 (file)
--- a/src/Tizen.Location/Tizen.Location.csproj
+++ b/src/Tizen.Location/Tizen.Location.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Log/Tizen.Log.csproj b/src/Tizen.Log/Tizen.Log.csproj
index e73da10..dbdcea4 100644 (file)
--- a/src/Tizen.Log/Tizen.Log.csproj
+++ b/src/Tizen.Log/Tizen.Log.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
 </Project>

diff --git a/src/Tizen.Maps/Tizen.Maps.csproj b/src/Tizen.Maps/Tizen.Maps.csproj
index 3bd4eaf..ae92048 100644 (file)
--- a/src/Tizen.Maps/Tizen.Maps.csproj
+++ b/src/Tizen.Maps/Tizen.Maps.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -11,10 +11,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.ComponentModel" Version="$(SystemPackageVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
     <None Update="res\maps_marker_pin_48.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

diff --git a/src/Tizen.Messaging.Push/Tizen.Messaging.Push.csproj b/src/Tizen.Messaging.Push/Tizen.Messaging.Push.csproj
index 11cd4a8..7f4584f 100644 (file)
--- a/src/Tizen.Messaging.Push/Tizen.Messaging.Push.csproj
+++ b/src/Tizen.Messaging.Push/Tizen.Messaging.Push.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Messaging/Tizen.Messaging.csproj b/src/Tizen.Messaging/Tizen.Messaging.csproj
index 11cd4a8..7f4584f 100644 (file)
--- a/src/Tizen.Messaging/Tizen.Messaging.csproj
+++ b/src/Tizen.Messaging/Tizen.Messaging.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Multimedia.AudioIO/Tizen.Multimedia.AudioIO.csproj b/src/Tizen.Multimedia.AudioIO/Tizen.Multimedia.AudioIO.csproj
index dec532e..ec9bff7 100644 (file)
--- a/src/Tizen.Multimedia.AudioIO/Tizen.Multimedia.AudioIO.csproj
+++ b/src/Tizen.Multimedia.AudioIO/Tizen.Multimedia.AudioIO.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Multimedia.Camera/Tizen.Multimedia.Camera.csproj b/src/Tizen.Multimedia.Camera/Tizen.Multimedia.Camera.csproj
index dec532e..ec9bff7 100644 (file)
--- a/src/Tizen.Multimedia.Camera/Tizen.Multimedia.Camera.csproj
+++ b/src/Tizen.Multimedia.Camera/Tizen.Multimedia.Camera.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Multimedia.MediaCodec/Tizen.Multimedia.MediaCodec.csproj b/src/Tizen.Multimedia.MediaCodec/Tizen.Multimedia.MediaCodec.csproj
index dec532e..ec9bff7 100644 (file)
--- a/src/Tizen.Multimedia.MediaCodec/Tizen.Multimedia.MediaCodec.csproj
+++ b/src/Tizen.Multimedia.MediaCodec/Tizen.Multimedia.MediaCodec.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Multimedia.MediaPlayer/Tizen.Multimedia.MediaPlayer.csproj b/src/Tizen.Multimedia.MediaPlayer/Tizen.Multimedia.MediaPlayer.csproj
index dec532e..ec9bff7 100644 (file)
--- a/src/Tizen.Multimedia.MediaPlayer/Tizen.Multimedia.MediaPlayer.csproj
+++ b/src/Tizen.Multimedia.MediaPlayer/Tizen.Multimedia.MediaPlayer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Multimedia.Metadata/Tizen.Multimedia.Metadata.csproj b/src/Tizen.Multimedia.Metadata/Tizen.Multimedia.Metadata.csproj
index dec532e..ec9bff7 100644 (file)
--- a/src/Tizen.Multimedia.Metadata/Tizen.Multimedia.Metadata.csproj
+++ b/src/Tizen.Multimedia.Metadata/Tizen.Multimedia.Metadata.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Multimedia.Radio/Tizen.Multimedia.Radio.csproj b/src/Tizen.Multimedia.Radio/Tizen.Multimedia.Radio.csproj
index d9f42fb..8d4fb31 100644 (file)
--- a/src/Tizen.Multimedia.Radio/Tizen.Multimedia.Radio.csproj
+++ b/src/Tizen.Multimedia.Radio/Tizen.Multimedia.Radio.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Multimedia.Recorder/Tizen.Multimedia.Recorder.csproj b/src/Tizen.Multimedia.Recorder/Tizen.Multimedia.Recorder.csproj
index 4731ceb..bd01a3b 100644 (file)
--- a/src/Tizen.Multimedia.Recorder/Tizen.Multimedia.Recorder.csproj
+++ b/src/Tizen.Multimedia.Recorder/Tizen.Multimedia.Recorder.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Multimedia.Remoting/Tizen.Multimedia.Remoting.csproj b/src/Tizen.Multimedia.Remoting/Tizen.Multimedia.Remoting.csproj
index dec532e..ec9bff7 100644 (file)
--- a/src/Tizen.Multimedia.Remoting/Tizen.Multimedia.Remoting.csproj
+++ b/src/Tizen.Multimedia.Remoting/Tizen.Multimedia.Remoting.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Multimedia.StreamRecorder/Tizen.Multimedia.StreamRecorder.csproj b/src/Tizen.Multimedia.StreamRecorder/Tizen.Multimedia.StreamRecorder.csproj
index 82dec4d..9b8e9e6 100644 (file)
--- a/src/Tizen.Multimedia.StreamRecorder/Tizen.Multimedia.StreamRecorder.csproj
+++ b/src/Tizen.Multimedia.StreamRecorder/Tizen.Multimedia.StreamRecorder.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Multimedia.Util/Tizen.Multimedia.Util.csproj b/src/Tizen.Multimedia.Util/Tizen.Multimedia.Util.csproj
index dec532e..ec9bff7 100644 (file)
--- a/src/Tizen.Multimedia.Util/Tizen.Multimedia.Util.csproj
+++ b/src/Tizen.Multimedia.Util/Tizen.Multimedia.Util.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Multimedia.Vision/Tizen.Multimedia.Vision.csproj b/src/Tizen.Multimedia.Vision/Tizen.Multimedia.Vision.csproj
index dec532e..ec9bff7 100644 (file)
--- a/src/Tizen.Multimedia.Vision/Tizen.Multimedia.Vision.csproj
+++ b/src/Tizen.Multimedia.Vision/Tizen.Multimedia.Vision.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Multimedia/Tizen.Multimedia.csproj b/src/Tizen.Multimedia/Tizen.Multimedia.csproj
index fd0854a..3b5598e 100644 (file)
--- a/src/Tizen.Multimedia/Tizen.Multimedia.csproj
+++ b/src/Tizen.Multimedia/Tizen.Multimedia.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.NUI/Tizen.NUI.csproj b/src/Tizen.NUI/Tizen.NUI.csproj
index 53c7e3d..22cb378 100755 (executable)
--- a/src/Tizen.NUI/Tizen.NUI.csproj
+++ b/src/Tizen.NUI/Tizen.NUI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <DefineConstants>$(DefineConstants);DEBUG_ON</DefineConstants>
   </PropertyGroup>
 
@@ -10,10 +10,6 @@
     <ProjectReference Include="..\Tizen.System.SystemSettings\Tizen.System.SystemSettings.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="System.Reflection.TypeExtensions" Version="$(SystemPackageVersion)" PrivateAssets="All" />
-  </ItemGroup>
-
   <Target Name="ChangeAliasesOfStrongNameAssemblies" BeforeTargets="FindReferenceAssembliesForReferences;ResolveReferences">
     <ItemGroup>
       <ReferencePath Condition="'%(FileName)' == 'Tizen.System.SystemSettings'">

diff --git a/src/Tizen.NUI/src/internal/dotnetcore/AddedException.cs b/src/Tizen.NUI/src/internal/dotnetcore/AddedException.cs
deleted file mode 100755 (executable)
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 (executable)
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 (file)
--- a/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth.csproj
+++ b/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Network.Connection/Tizen.Network.Connection.csproj b/src/Tizen.Network.Connection/Tizen.Network.Connection.csproj
index 11cd4a8..7f4584f 100644 (file)
--- a/src/Tizen.Network.Connection/Tizen.Network.Connection.csproj
+++ b/src/Tizen.Network.Connection/Tizen.Network.Connection.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.csproj b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.csproj
index 11cd4a8..7f4584f 100644 (file)
--- a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.csproj
+++ b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Network.Mtp/Tizen.Network.Mtp.csproj b/src/Tizen.Network.Mtp/Tizen.Network.Mtp.csproj
index 11cd4a8..7f4584f 100644 (file)
--- a/src/Tizen.Network.Mtp/Tizen.Network.Mtp.csproj
+++ b/src/Tizen.Network.Mtp/Tizen.Network.Mtp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Network.Nfc/Tizen.Network.Nfc.csproj b/src/Tizen.Network.Nfc/Tizen.Network.Nfc.csproj
index dd1bde7..aeeef3f 100644 (file)
--- a/src/Tizen.Network.Nfc/Tizen.Network.Nfc.csproj
+++ b/src/Tizen.Network.Nfc/Tizen.Network.Nfc.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Network.Nsd/Tizen.Network.Nsd.csproj b/src/Tizen.Network.Nsd/Tizen.Network.Nsd.csproj
index 11cd4a8..7f4584f 100644 (file)
--- a/src/Tizen.Network.Nsd/Tizen.Network.Nsd.csproj
+++ b/src/Tizen.Network.Nsd/Tizen.Network.Nsd.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard.csproj b/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard.csproj
index 11cd4a8..7f4584f 100644 (file)
--- a/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard.csproj
+++ b/src/Tizen.Network.Smartcard/Tizen.Network.Smartcard.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Network.WiFi/Tizen.Network.WiFi.csproj b/src/Tizen.Network.WiFi/Tizen.Network.WiFi.csproj
index 819343d..b3b1ca1 100644 (file)
--- a/src/Tizen.Network.WiFi/Tizen.Network.WiFi.csproj
+++ b/src/Tizen.Network.WiFi/Tizen.Network.WiFi.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Network.WiFiDirect/Tizen.Network.WiFiDirect.csproj b/src/Tizen.Network.WiFiDirect/Tizen.Network.WiFiDirect.csproj
index cda3b93..4c51c41 100644 (file)
--- a/src/Tizen.Network.WiFiDirect/Tizen.Network.WiFiDirect.csproj
+++ b/src/Tizen.Network.WiFiDirect/Tizen.Network.WiFiDirect.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -9,8 +9,4 @@
     <ProjectReference Include="..\Tizen.Log\Tizen.Log.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="System.Threading.Thread" Version="$(SystemPackageVersion)" PrivateAssets="All" />
-  </ItemGroup>
-
 </Project>
\ 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 (file)
--- a/src/Tizen.PhonenumberUtils/Tizen.PhonenumberUtils.csproj
+++ b/src/Tizen.PhonenumberUtils/Tizen.PhonenumberUtils.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Pims.Calendar/Tizen.Pims.Calendar.csproj b/src/Tizen.Pims.Calendar/Tizen.Pims.Calendar.csproj
index 11cd4a8..7f4584f 100644 (file)
--- a/src/Tizen.Pims.Calendar/Tizen.Pims.Calendar.csproj
+++ b/src/Tizen.Pims.Calendar/Tizen.Pims.Calendar.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Pims.Contacts/Tizen.Pims.Contacts.csproj b/src/Tizen.Pims.Contacts/Tizen.Pims.Contacts.csproj
index 45ee828..4c51c41 100644 (file)
--- a/src/Tizen.Pims.Contacts/Tizen.Pims.Contacts.csproj
+++ b/src/Tizen.Pims.Contacts/Tizen.Pims.Contacts.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.csproj b/src/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.csproj
index 45ee828..4c51c41 100644 (file)
--- a/src/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.csproj
+++ b/src/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Security.TEEC/Tizen.Security.TEEC.csproj b/src/Tizen.Security.TEEC/Tizen.Security.TEEC.csproj
index 45ee828..4c51c41 100644 (file)
--- a/src/Tizen.Security.TEEC/Tizen.Security.TEEC.csproj
+++ b/src/Tizen.Security.TEEC/Tizen.Security.TEEC.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Security/Tizen.Security.csproj b/src/Tizen.Security/Tizen.Security.csproj
index 922c310..eec4f4a 100644 (file)
--- a/src/Tizen.Security/Tizen.Security.csproj
+++ b/src/Tizen.Security/Tizen.Security.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Sensor/Tizen.Sensor.csproj b/src/Tizen.Sensor/Tizen.Sensor.csproj
index 3cc4118..348907f 100644 (file)
--- a/src/Tizen.Sensor/Tizen.Sensor.csproj
+++ b/src/Tizen.Sensor/Tizen.Sensor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.System.Feedback/Tizen.System.Feedback.csproj b/src/Tizen.System.Feedback/Tizen.System.Feedback.csproj
index 45ee828..4c51c41 100644 (file)
--- a/src/Tizen.System.Feedback/Tizen.System.Feedback.csproj
+++ b/src/Tizen.System.Feedback/Tizen.System.Feedback.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.System.Information/Tizen.System.Information.csproj b/src/Tizen.System.Information/Tizen.System.Information.csproj
index 11cd4a8..7f4584f 100644 (file)
--- a/src/Tizen.System.Information/Tizen.System.Information.csproj
+++ b/src/Tizen.System.Information/Tizen.System.Information.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.System.MediaKey/Tizen.System.MediaKey.csproj b/src/Tizen.System.MediaKey/Tizen.System.MediaKey.csproj
index 45ee828..4c51c41 100644 (file)
--- a/src/Tizen.System.MediaKey/Tizen.System.MediaKey.csproj
+++ b/src/Tizen.System.MediaKey/Tizen.System.MediaKey.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.System.PlatformConfig/Tizen.System.PlatformConfig.csproj b/src/Tizen.System.PlatformConfig/Tizen.System.PlatformConfig.csproj
index 45ee828..4c51c41 100644 (file)
--- a/src/Tizen.System.PlatformConfig/Tizen.System.PlatformConfig.csproj
+++ b/src/Tizen.System.PlatformConfig/Tizen.System.PlatformConfig.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.System.Storage/Tizen.System.Storage.csproj b/src/Tizen.System.Storage/Tizen.System.Storage.csproj
index 45ee828..4c51c41 100644 (file)
--- a/src/Tizen.System.Storage/Tizen.System.Storage.csproj
+++ b/src/Tizen.System.Storage/Tizen.System.Storage.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.System.SystemSettings/Tizen.System.SystemSettings.csproj b/src/Tizen.System.SystemSettings/Tizen.System.SystemSettings.csproj
index 11cd4a8..7f4584f 100644 (file)
--- a/src/Tizen.System.SystemSettings/Tizen.System.SystemSettings.csproj
+++ b/src/Tizen.System.SystemSettings/Tizen.System.SystemSettings.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.System/Tizen.System.csproj b/src/Tizen.System/Tizen.System.csproj
index 45ee828..4c51c41 100644 (file)
--- a/src/Tizen.System/Tizen.System.csproj
+++ b/src/Tizen.System/Tizen.System.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Tapi/Tizen.Tapi.csproj b/src/Tizen.Tapi/Tizen.Tapi.csproj
index 45ee828..4c51c41 100644 (file)
--- a/src/Tizen.Tapi/Tizen.Tapi.csproj
+++ b/src/Tizen.Tapi/Tizen.Tapi.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Telephony/Tizen.Telephony.csproj b/src/Tizen.Telephony/Tizen.Telephony.csproj
index 45ee828..4c51c41 100644 (file)
--- a/src/Tizen.Telephony/Tizen.Telephony.csproj
+++ b/src/Tizen.Telephony/Tizen.Telephony.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Tracer/Tizen.Tracer.csproj b/src/Tizen.Tracer/Tizen.Tracer.csproj
index 45ee828..4c51c41 100644 (file)
--- a/src/Tizen.Tracer/Tizen.Tracer.csproj
+++ b/src/Tizen.Tracer/Tizen.Tracer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Uix.InputMethod/Tizen.Uix.InputMethod.csproj b/src/Tizen.Uix.InputMethod/Tizen.Uix.InputMethod.csproj
index 895f913..973f027 100644 (file)
--- a/src/Tizen.Uix.InputMethod/Tizen.Uix.InputMethod.csproj
+++ b/src/Tizen.Uix.InputMethod/Tizen.Uix.InputMethod.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Uix.InputMethodManager/Tizen.Uix.InputMethodManager.csproj b/src/Tizen.Uix.InputMethodManager/Tizen.Uix.InputMethodManager.csproj
index 45ee828..4c51c41 100644 (file)
--- a/src/Tizen.Uix.InputMethodManager/Tizen.Uix.InputMethodManager.csproj
+++ b/src/Tizen.Uix.InputMethodManager/Tizen.Uix.InputMethodManager.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Uix.Stt/Tizen.Uix.Stt.csproj b/src/Tizen.Uix.Stt/Tizen.Uix.Stt.csproj
index 45ee828..4c51c41 100644 (file)
--- a/src/Tizen.Uix.Stt/Tizen.Uix.Stt.csproj
+++ b/src/Tizen.Uix.Stt/Tizen.Uix.Stt.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Uix.SttEngine/Tizen.Uix.SttEngine.csproj b/src/Tizen.Uix.SttEngine/Tizen.Uix.SttEngine.csproj
index 45ee828..4c51c41 100755 (executable)
--- a/src/Tizen.Uix.SttEngine/Tizen.Uix.SttEngine.csproj
+++ b/src/Tizen.Uix.SttEngine/Tizen.Uix.SttEngine.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Uix.Tts/Tizen.Uix.Tts.csproj b/src/Tizen.Uix.Tts/Tizen.Uix.Tts.csproj
index 45ee828..4c51c41 100644 (file)
--- a/src/Tizen.Uix.Tts/Tizen.Uix.Tts.csproj
+++ b/src/Tizen.Uix.Tts/Tizen.Uix.Tts.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Uix.TtsEngine/Tizen.Uix.TtsEngine.csproj b/src/Tizen.Uix.TtsEngine/Tizen.Uix.TtsEngine.csproj
index 45ee828..4c51c41 100755 (executable)
--- a/src/Tizen.Uix.TtsEngine/Tizen.Uix.TtsEngine.csproj
+++ b/src/Tizen.Uix.TtsEngine/Tizen.Uix.TtsEngine.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.csproj b/src/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.csproj
index 45ee828..4c51c41 100644 (file)
--- a/src/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.csproj
+++ b/src/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.WebView/Tizen.WebView.csproj b/src/Tizen.WebView/Tizen.WebView.csproj
index ea3ba84..48e80f0 100644 (file)
--- a/src/Tizen.WebView/Tizen.WebView.csproj
+++ b/src/Tizen.WebView/Tizen.WebView.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen/Tizen.csproj b/src/Tizen/Tizen.csproj
index e73da10..dbdcea4 100644 (file)
--- a/src/Tizen/Tizen.csproj
+++ b/src/Tizen/Tizen.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
 </Project>

diff --git a/tools/module.csproj.template b/tools/module.csproj.template
index 2257110..30cd5a4 100644 (file)
--- a/tools/module.csproj.template
+++ b/tools/module.csproj.template
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
 

diff --git a/tools/retry.sh b/tools/retry.sh
new file mode 100755 (executable)
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 (executable)
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 <brad@footle.org>
+#                       Make more portable by using the 'CHLD'
+#                       signal spec rather than 17.
+#    V1.3, Oct 29 2009, Ján Sáreník <jasan@x31.com>
+#                       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 <jasan@x31.com>
+#                       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
+