Revert "Fix project files to support netstandard 1.6"

This reverts commit 920b0ec17158b3ebe551566243f96032d81917f0.

Change-Id: I52bc66fbdac7a6eb880f8f17927a8882ae7baa57

diff --git a/.gitignore b/.gitignore
index 46619d5..17dd954 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,4 @@ obj/
 *.exe
 *.dll
 *.csproj.user
-*.lock.json
 .vs/

diff --git a/Tizen.Network.IoTConnectivity/CoreFx.References.targets b/Tizen.Network.IoTConnectivity/CoreFx.References.targets
new file mode 100644 (file)
index 0000000..dab29ec
--- /dev/null
+++ b/Tizen.Network.IoTConnectivity/CoreFx.References.targets
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Condition=" '$(CoreFxPath)' != '' ">
+     <Reference Include="Microsoft.Win32.Primitives">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/Microsoft.Win32.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.AppContext">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.AppContext.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Collections.Concurrent">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Collections.Concurrent.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Collections">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Collections.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ComponentModel.Annotations">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.ComponentModel.Annotations.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ComponentModel">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.ComponentModel.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Console">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Console.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Diagnostics.Debug">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Diagnostics.Debug.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Diagnostics.Process">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Diagnostics.Process.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Diagnostics.Tools">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Diagnostics.Tools.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Diagnostics.TraceSource">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Diagnostics.TraceSource.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Diagnostics.Tracing">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Diagnostics.Tracing.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Dynamic.Runtime">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Dynamic.Runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Globalization.Calendars">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Globalization.Calendars.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Globalization">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Globalization.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Globalization.Extensions">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Globalization.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Compression">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.IO.Compression.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Compression.ZipFile">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.IO.Compression.ZipFile.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.IO.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.FileSystem">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.IO.FileSystem.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.FileSystem.Primitives">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.IO.FileSystem.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.FileSystem.Watcher">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.IO.FileSystem.Watcher.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.MemoryMappedFiles">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.IO.MemoryMappedFiles.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.UnmanagedMemoryStream">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.IO.UnmanagedMemoryStream.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Linq">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Linq.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Linq.Expressions">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Linq.Expressions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Linq.Parallel">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Linq.Parallel.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Linq.Queryable">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Linq.Queryable.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Net.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.NameResolution">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Net.NameResolution.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Primitives">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Net.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Requests">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Net.Requests.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Security">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Net.Security.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Sockets">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Net.Sockets.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.WebHeaderCollection">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Net.WebHeaderCollection.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics.Vectors">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ObjectModel">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.ObjectModel.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reflection.DispatchProxy">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Reflection.DispatchProxy.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reflection">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Reflection.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reflection.Extensions">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Reflection.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reflection.Primitives">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Reflection.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reflection.TypeExtensions">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Reflection.TypeExtensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Resources.ResourceManager">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Resources.ResourceManager.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.Extensions">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Runtime.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.Handles">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Runtime.Handles.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.InteropServices">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Runtime.InteropServices.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.InteropServices.RuntimeInformation">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.Loader">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Runtime.Loader.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.Numerics">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Runtime.Numerics.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Algorithms">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Security.Cryptography.Algorithms.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Encoding">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Security.Cryptography.Encoding.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Primitives">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Security.Cryptography.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.X509Certificates">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Security.Cryptography.X509Certificates.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Encoding">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Text.Encoding.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Encoding.Extensions">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Text.Encoding.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.RegularExpressions">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Text.RegularExpressions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Threading.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Threading.Tasks.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Parallel">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Threading.Tasks.Parallel.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Thread">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Threading.Thread.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.ThreadPool">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Threading.ThreadPool.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Timer">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Threading.Timer.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.ReaderWriter">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Xml.ReaderWriter.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.XDocument">
+      <Private>False</Private>
+      <HintPath>$(CoreFxPath)/System.Xml.XDocument.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+</Project>
\ No newline at end of file

diff --git a/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.Net45.csproj b/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.Net45.csproj
deleted file mode 100644 (file)
index 43c8cf4..0000000
--- a/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.Net45.csproj
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProjectGuid>{CBA7E5E8-8A24-446F-91C0-0FF2B198705E}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>Tizen.Network.IoTConnectivity</RootNamespace>\r
-    <AssemblyName>Tizen.Network.IoTConnectivity</AssemblyName>\r
-    <FileAlignment>512</FileAlignment>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <Optimize>true</Optimize>\r
-    <OutputPath>bin\Debug\Net45\</OutputPath>\r
-    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <Optimize>true</Optimize>\r
-    <OutputPath>bin\Release\Net45\</OutputPath>\r
-    <DefineConstants>TRACE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>Tizen.Network.IoTConnectivity.snk</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="System" />\r
-    <Reference Include="System.Core" />\r
-    <Reference Include="System.Xml.Linq" />\r
-    <Reference Include="System.Data.DataSetExtensions" />\r
-    <Reference Include="Microsoft.CSharp" />\r
-    <Reference Include="System.Data" />\r
-    <Reference Include="System.Net.Http" />\r
-    <Reference Include="System.Xml" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Compile Include="Tizen.Network.IoTConnectivity\Attributes.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\CacheUpdatedEventArgs.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\DeviceInformationFoundEventArgs.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\FindingErrorOccurredEventArgs.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\IoTConnectivityClientManager.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\IoTConnectivityErrorFactory.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\LiteResource.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\ObserverNotifiedEventArgs.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\PlatformInformationFoundEventArgs.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\PresenceReceivedEventArgs.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\RemoteResource.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\RemoteResponse.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\ResourceFoundEventArgs.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\ResourceInterfaces.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\ResourceQuery.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\Representation.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\ResourceOptions.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\ResourceTypes.cs" />\r
-    <Compile Include="Interop\Interop.Libraries.cs" />\r
-    <Compile Include="Properties\AssemblyInfo.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\IoTConnectivityServerManager.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\Request.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\Resource.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\Response.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\ObservePolicy.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\PresenceEventType.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\QualityOfService.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\FindingError.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\ResourcePolicy.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\ResourceState.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\ResponseCode.cs" />\r
-    <Compile Include="Interop\Interop.IoTConnectivity.Client.cs" />\r
-    <Compile Include="Interop\Interop.IoTConnectivity.Common.cs" />\r
-    <Compile Include="Interop\Interop.IoTConnectivity.Server.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\ObserveType.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\StateChangedEventArgs.cs" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <None Include="Tizen.Network.IoTConnectivity.Net45.project.json" />\r
-    <None Include="Tizen.Network.IoTConnectivity.nuspec" />\r
-    <None Include="Tizen.Network.IoTConnectivity.snk" />\r
-  </ItemGroup>\r
-  <Import Project="$(MSBuildExtensionsPath)\Tizen\Tizen.CSharp.GBS.targets" Condition="Exists('$(MSBuildExtensionsPath)\Tizen\Tizen.CSharp.GBS.targets')" />\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->\r
-</Project>
\ No newline at end of file

diff --git a/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.Net45.project.json b/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.Net45.project.json
deleted file mode 100644 (file)
index d9af4f0..0000000
--- a/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.Net45.project.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "dependencies": {
-    "Tizen": "1.0.0"
-  },
-  "frameworks": {
-    "net45": {}
-  },
-  "runtimes": {
-    "win": {}
-  }
-}

diff --git a/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.csproj b/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.csproj
index 78554c0..0eb151d 100644 (file)
--- a/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.csproj
+++ b/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.csproj
@@ -1,108 +1,125 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProjectGuid>{3577EAE8-B409-4BAE-A5DA-C6340BE1DBC2}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>Tizen.Network.IoTConnectivity</RootNamespace>\r
-    <AssemblyName>Tizen.Network.IoTConnectivity</AssemblyName>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>\r
-    <TargetFrameworkVersion>v1.6</TargetFrameworkVersion>\r
-    <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker>\r
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
-    <NoStdLib>true</NoStdLib>\r
-    <NoWarn>$(NoWarn);1701;1702</NoWarn>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <Optimize>true</Optimize>\r
-    <OutputPath>bin\Debug\</OutputPath>\r
-    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <Optimize>true</Optimize>\r
-    <OutputPath>bin\Release\</OutputPath>\r
-    <DefineConstants>TRACE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>Tizen.Network.IoTConnectivity.snk</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Compile Include="Tizen.Network.IoTConnectivity\Attributes.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\CacheUpdatedEventArgs.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\DeviceInformationFoundEventArgs.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\FindingErrorOccurredEventArgs.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\IoTConnectivityClientManager.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\IoTConnectivityErrorFactory.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\LiteResource.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\ObserverNotifiedEventArgs.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\PlatformInformationFoundEventArgs.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\PresenceReceivedEventArgs.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\RemoteResource.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\RemoteResponse.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\ResourceFoundEventArgs.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\ResourceInterfaces.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\ResourceQuery.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\Representation.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\ResourceOptions.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\ResourceTypes.cs" />\r
-    <Compile Include="Interop\Interop.Libraries.cs" />\r
-    <Compile Include="Properties\AssemblyInfo.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\IoTConnectivityServerManager.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\Request.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\Resource.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\Response.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\ObservePolicy.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\PresenceEventType.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\QualityOfService.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\FindingError.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\ResourcePolicy.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\ResourceState.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\ResponseCode.cs" />\r
-    <Compile Include="Interop\Interop.IoTConnectivity.Client.cs" />\r
-    <Compile Include="Interop\Interop.IoTConnectivity.Common.cs" />\r
-    <Compile Include="Interop\Interop.IoTConnectivity.Server.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\ObserveType.cs" />\r
-    <Compile Include="Tizen.Network.IoTConnectivity\StateChangedEventArgs.cs" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <None Include="Tizen.Network.IoTConnectivity.nuspec" />\r
-    <None Include="Tizen.Network.IoTConnectivity.project.json" />\r
-    <None Include="Tizen.Network.IoTConnectivity.snk" />\r
-  </ItemGroup>\r
-  <Import Project="$(MSBuildExtensionsPath)\Tizen\Tizen.CSharp.GBS.targets" Condition="Exists('$(MSBuildExtensionsPath)\Tizen\Tizen.CSharp.GBS.targets')" />\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{3577EAE8-B409-4BAE-A5DA-C6340BE1DBC2}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Tizen.Network.IoTConnectivity</RootNamespace>
+    <AssemblyName>Tizen.Network.IoTConnectivity</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>Tizen.Network.IoTConnectivity.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <Import Project="CoreFx.References.targets" />
+  <ItemGroup Condition=" '$(CoreFxPath)' == '' ">
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Runtime" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Tizen.Network.IoTConnectivity\Attributes.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\CacheUpdatedEventArgs.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\DeviceInformationFoundEventArgs.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\FindingErrorOccurredEventArgs.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\IoTConnectivityClientManager.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\IoTConnectivityErrorFactory.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\LiteResource.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\ObserverNotifiedEventArgs.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\PlatformInformationFoundEventArgs.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\PresenceReceivedEventArgs.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\RemoteResource.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\RemoteResponse.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\ResourceFoundEventArgs.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\ResourceInterfaces.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\ResourceQuery.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\Representation.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\ResourceOptions.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\ResourceTypes.cs" />
+    <Compile Include="Interop\Interop.Libraries.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\IoTConnectivityServerManager.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\Request.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\Resource.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\Response.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\ObservePolicy.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\PresenceEventType.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\QualityOfService.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\FindingError.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\ResourcePolicy.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\ResourceState.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\ResponseCode.cs" />
+    <Compile Include="Interop\Interop.IoTConnectivity.Client.cs" />
+    <Compile Include="Interop\Interop.IoTConnectivity.Common.cs" />
+    <Compile Include="Interop\Interop.IoTConnectivity.Server.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\ObserveType.cs" />
+    <Compile Include="Tizen.Network.IoTConnectivity\StateChangedEventArgs.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Tizen.Network.IoTConnectivity.snk" />
+  </ItemGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <Reference Include="Tizen">
+      <PkgConfig>csapi-tizen</PkgConfig>
+      <HintPath>..\..\tizen\Tizen\obj\Debug\Tizen.dll</HintPath>
+    </Reference>
+    <Reference Include="Tizen.Internals">
+      <PkgConfig>csapi-tizen</PkgConfig>
+      <HintPath>..\..\tizen\Tizen.Internals\bin\Debug\Tizen.Internals.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\tizen\Tizen.Internals\Tizen.Internals.csproj">
+      <Project>{B9AA1CB2-F72D-4A30-A33B-A20C850A38A0}</Project>
+      <Name>Tizen.Internals</Name>
+      <Private>True</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\tizen\Tizen\Tizen.csproj">
+      <Project>{7659CA59-410D-41A1-9841-586E88BC78C9}</Project>
+      <Name>Tizen</Name>
+      <Private>True</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->\r
-  <PropertyGroup>\r
-    <!-- https://github.com/dotnet/corefxlab/tree/master/samples/NetCoreSample and
-       https://docs.microsoft.com/en-us/dotnet/articles/core/tutorials/target-dotnetcore-with-msbuild
-    -->\r
-    <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two
-       properties to any folder that exists to skip the GetReferenceAssemblyPaths task (not target) and
-       to prevent it from outputting a warning (MSB3644).
-    -->\r
-    <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)</_TargetFrameworkDirectories>\r
-    <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)</_FullFrameworkReferenceAssemblyPaths>\r
-    <AutoUnifyAssemblyReferences>true</AutoUnifyAssemblyReferences>\r
-  </PropertyGroup>\r
-</Project>
\ No newline at end of file
+  -->
+</Project>

diff --git a/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.nuspec b/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.nuspec
deleted file mode 100644 (file)
index cf6cc06..0000000
--- a/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.nuspec
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<package>
-  <metadata>
-               <id>Tizen.Network.IoTConnectivity</id>
-               <version>$version$</version>
-               <authors>Tizen Developers</authors>
-               <description>IoTConnectivity API for Tizen.Net</description>
-    <dependencies>
-      <dependency id="Tizen" version="1.0.0" />
-    </dependencies>
-       </metadata>
-</package>

diff --git a/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.project.json b/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.project.json
deleted file mode 100644 (file)
index beb9e15..0000000
--- a/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.project.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "dependencies": {
-    "NETStandard.Library": "1.6.0",
-    "Tizen": "1.0.0"
-  },
-  "frameworks": {
-    "netstandard1.6": {}
-  },
-  "runtimes": {
-    "win": {}
-  }
-}

diff --git a/packaging/csapi-network-iotconnectivity.spec b/packaging/csapi-network-iotconnectivity.spec
index c7e525f..1d8a412 100644 (file)
--- a/packaging/csapi-network-iotconnectivity.spec
+++ b/packaging/csapi-network-iotconnectivity.spec
@@ -1,4 +1,4 @@
-%{!?dotnet_assembly_path: %define dotnet_assembly_path /opt/usr/share/dotnet.tizen/framework}
+%{!?dotnet_assembly_path: %define dotnet_assembly_path %{_datadir}/assembly}
 %{!?dotnet_core_path: %define dotnet_core_path %{_datadir}/tizen.net/ref}
 
 %if 0%{?tizen_build_devel_mode}
@@ -27,10 +27,8 @@ AutoReqProv: no
 BuildRequires: corefx-managed-32b-ref
 %endif
 
-BuildRequires: dotnet-build-tools
-
 # C# API Requires
-BuildRequires: csapi-tizen-devel
+BuildRequires: csapi-tizen
 
 %description
 Tizen IoTConnectivity API for C#
@@ -42,69 +40,25 @@ cp %{SOURCE1} .
 %define Assemblies Tizen.Network.IoTConnectivity
 
 %build
-# Build for Net45
 for ASM in %{Assemblies}; do
-if [ -e $ASM/$ASM.Net45.csproj ]; then
-  xbuild $ASM/$ASM.Net45.csproj \
-         /p:Configuration=%{BUILDCONF} \
-         /p:DotnetAssemblyPath=%{dotnet_assembly_path}/devel/net45 \
-         /p:OutputPath=bin/net45
-fi
-
-# Build for Dotnet
+xbuild $ASM/$ASM.csproj \
 %if 0%{?_with_corefx}
-if [ -e $ASM/$ASM.csproj ]; then
-  xbuild $ASM/$ASM.csproj \
-         /p:Configuration=%{BUILDCONF} \
-         /p:DotnetAssemblyPath=%{dotnet_assembly_path}/devel/netstandard1.6 \
-         /p:CoreFxPath=%{dotnet_core_path} \
-         /p:OutputPath=bin/netstandard1.6
-fi
+        /p:NoStdLib=True \
+        /p:TargetFrameworkVersion=v5.0 \
+        /p:AddAdditionalExplicitAssemblyReferences=False \
+        /p:CoreFxPath=%{dotnet_core_path} \
 %endif
-
-# Make NuGet package
-dotnet-gbs pack $ASM/$ASM.nuspec --PackageVersion=%{version} --PackageFiles=$ASM/bin
-
+        /p:Configuration=%{BUILDCONF} \
+        /p:ReferencePath=%{dotnet_assembly_path}
 done
 
 %install
-mkdir -p %{buildroot}%{dotnet_assembly_path}/devel
+mkdir -p %{buildroot}%{dotnet_assembly_path}
 for ASM in %{Assemblies}; do
-  cp -fr $ASM/bin/* %{buildroot}%{dotnet_assembly_path}/devel
-%if 0%{?_with_corefx}
-  install -p -m 644 $ASM/bin/netstandard1.6/$ASM.dll %{buildroot}%{dotnet_assembly_path}
-%else
-  install -p -m 644 $ASM/bin/net45/$ASM.dll %{buildroot}%{dotnet_assembly_path}
-%endif
+install -p -m 644 $ASM/bin/%{BUILDCONF}/$ASM.dll %{buildroot}%{dotnet_assembly_path}
 done
 
-mkdir -p %{buildroot}/nuget
-install -p -m 644 *.nupkg %{buildroot}/nuget
-
 %files
 %manifest %{name}.manifest
 %license LICENSE
 %attr(644,root,root) %{dotnet_assembly_path}/*.dll
-
-%package devel
-Summary:   Development package for %{name}
-Group:     Development/Libraries
-Requires:  %{name} = %{version}-%{release}
-AutoReqProv: no
-
-%description devel
-Development package for %{name}
-
-%files devel
-%{dotnet_assembly_path}/devel/*
-
-%package nuget
-Summary:   NuGet package for %{name}
-Group:     Development/Libraries
-Requires:  %{name} = %{version}-%{release}
-
-%description nuget
-NuGet package for %{name}
-
-%files nuget
-/nuget/*.nupkg