Use nuget restore to solve dependencies

Change-Id: I0e981e1c49fec9ee4af3a70eacdefc8d631dd990
Signed-off-by: WonYoung Choi <wy80.choi@samsung.com>

diff --git a/Tizen.Telephony/Tizen.Telephony.Net45.csproj b/Tizen.Telephony/Tizen.Telephony.Net45.csproj
old mode 100755 (executable)
new mode 100644 (file)
index c5da583..bd56dd0
--- a/Tizen.Telephony/Tizen.Telephony.Net45.csproj
+++ b/Tizen.Telephony/Tizen.Telephony.Net45.csproj
@@ -1,72 +1,71 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{E87B20AE-B752-4E64-9517-4827AC42A33A}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Tizen.Telephony</RootNamespace>
-    <AssemblyName>Tizen.Telephony</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\Net45\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\Net45\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>Tizen.Telephony.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Interop\Interop.Libraries.cs" />
-    <Compile Include="Interop\Interop.Telephony.cs" />
-    <Compile Include="Interop\Interop.Call.cs" />
-    <Compile Include="Interop\Interop.Network.cs" />
-    <Compile Include="Interop\Interop.Modem.cs" />
-    <Compile Include="Interop\Interop.Sim.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Tizen.Telephony\CallHandle.cs" />
-    <Compile Include="Tizen.Telephony\Call.cs" />
-    <Compile Include="Tizen.Telephony\ChangeNotificationEventArgs.cs" />
-    <Compile Include="Tizen.Telephony\ExceptionFactory.cs" />
-    <Compile Include="Tizen.Telephony\Modem.cs" />
-    <Compile Include="Tizen.Telephony\Network.cs" />
-    <Compile Include="Tizen.Telephony\Sim.cs" />
-    <Compile Include="Tizen.Telephony\SlotHandle.cs" />
-    <Compile Include="Tizen.Telephony\StateEventArgs.cs" />
-    <Compile Include="Tizen.Telephony\Telephony.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Tizen.Telephony.nuspec" />
-    <None Include="Tizen.Telephony.Net45.project.json" />
-    <None Include="Tizen.Telephony.snk" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Tizen\Tizen.CSharp.GBS.targets" Condition="Exists('$(MSBuildExtensionsPath)\Tizen\Tizen.CSharp.GBS.targets')" />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<?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>{B0A02F90-8B02-4F35-AFD7-6A7EABD14A91}</ProjectGuid>\r
+    <OutputType>Library</OutputType>\r
+    <AppDesignerFolder>Properties</AppDesignerFolder>\r
+    <RootNamespace>Tizen.Telephony</RootNamespace>\r
+    <AssemblyName>Tizen.Telephony</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>false</Optimize>\r
+    <OutputPath>bin\Debug\Net45\</OutputPath>\r
+    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+    <Prefer32Bit>false</Prefer32Bit>\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
+    <Prefer32Bit>false</Prefer32Bit>\r
+  </PropertyGroup>\r
+  <PropertyGroup>\r
+    <SignAssembly>true</SignAssembly>\r
+  </PropertyGroup>\r
+  <PropertyGroup>\r
+    <AssemblyOriginatorKeyFile>Tizen.Telephony.snk</AssemblyOriginatorKeyFile>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <Compile Include="Interop\Interop.Libraries.cs" />\r
+    <Compile Include="Interop\Interop.Telephony.cs" />\r
+    <Compile Include="Interop\Interop.Call.cs" />\r
+    <Compile Include="Interop\Interop.Network.cs" />\r
+    <Compile Include="Interop\Interop.Modem.cs" />\r
+    <Compile Include="Interop\Interop.Sim.cs" />\r
+    <Compile Include="Properties\AssemblyInfo.cs" />\r
+    <Compile Include="Tizen.Telephony\CallHandle.cs" />\r
+    <Compile Include="Tizen.Telephony\Call.cs" />\r
+    <Compile Include="Tizen.Telephony\ChangeNotificationEventArgs.cs" />\r
+    <Compile Include="Tizen.Telephony\ExceptionFactory.cs" />\r
+    <Compile Include="Tizen.Telephony\Modem.cs" />\r
+    <Compile Include="Tizen.Telephony\Network.cs" />\r
+    <Compile Include="Tizen.Telephony\Sim.cs" />\r
+    <Compile Include="Tizen.Telephony\SlotHandle.cs" />\r
+    <Compile Include="Tizen.Telephony\StateEventArgs.cs" />\r
+    <Compile Include="Tizen.Telephony\Telephony.cs" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="Tizen.Telephony.nuspec" />\r
+    <None Include="Tizen.Telephony.Net45.project.json" />\r
+    <None Include="Tizen.Telephony.snk" />\r
+  </ItemGroup>\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.Telephony/Tizen.Telephony.Net45.project.json b/Tizen.Telephony/Tizen.Telephony.Net45.project.json
index d9af4f0..ab1a0ee 100755 (executable)
--- a/Tizen.Telephony/Tizen.Telephony.Net45.project.json
+++ b/Tizen.Telephony/Tizen.Telephony.Net45.project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "Tizen": "1.0.0"
+    "Tizen": "1.0.1"
   },
   "frameworks": {
     "net45": {}

diff --git a/Tizen.Telephony/Tizen.Telephony.csproj b/Tizen.Telephony/Tizen.Telephony.csproj
index 5929b10..8d5c062 100755 (executable)
--- a/Tizen.Telephony/Tizen.Telephony.csproj
+++ b/Tizen.Telephony/Tizen.Telephony.csproj
@@ -12,8 +12,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v1.6</TargetFrameworkVersion>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker>
+    <TargetFrameworkVersion>v1.3</TargetFrameworkVersion>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
     <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
     <NoStdLib>true</NoStdLib>
     <NoWarn>$(NoWarn);1701;1702</NoWarn>
@@ -67,9 +67,8 @@
     <None Include="Tizen.Telephony.project.json" />
     <None Include="Tizen.Telephony.snk" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Tizen\Tizen.CSharp.GBS.targets" Condition="Exists('$(MSBuildExtensionsPath)\Tizen\Tizen.CSharp.GBS.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- 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>

diff --git a/Tizen.Telephony/Tizen.Telephony.nuspec b/Tizen.Telephony/Tizen.Telephony.nuspec
index 3c91083..741d863 100755 (executable)
--- a/Tizen.Telephony/Tizen.Telephony.nuspec
+++ b/Tizen.Telephony/Tizen.Telephony.nuspec
@@ -6,7 +6,11 @@
                <authors>Tizen Developers</authors>
                <description>Telephony API for Tizen.Net</description>
     <dependencies>
-      <dependency id="Tizen" version="1.0.0" />
+      <dependency id="Tizen" version="1.0.1" />
     </dependencies>
        </metadata>
+  <files>
+    <file src="bin/$Configuration$/Tizen.Telephony.dll" target="lib/netstandard1.3" />
+    <file src="bin/$Configuration$/Net45/Tizen.Telephony.dll" target="lib/net45" />
+  </files>
 </package>

diff --git a/Tizen.Telephony/Tizen.Telephony.project.json b/Tizen.Telephony/Tizen.Telephony.project.json
index beb9e15..db7436c 100755 (executable)
--- a/Tizen.Telephony/Tizen.Telephony.project.json
+++ b/Tizen.Telephony/Tizen.Telephony.project.json
@@ -1,12 +1,9 @@
 {
   "dependencies": {
     "NETStandard.Library": "1.6.0",
-    "Tizen": "1.0.0"
+    "Tizen": "1.0.1"
   },
   "frameworks": {
-    "netstandard1.6": {}
-  },
-  "runtimes": {
-    "win": {}
+    "netstandard1.3": {}
   }
 }

diff --git a/packaging/csapi-telephony.spec b/packaging/csapi-telephony.spec
index 67c3bd1..42559a8 100755 (executable)
--- a/packaging/csapi-telephony.spec
+++ b/packaging/csapi-telephony.spec
@@ -1,5 +1,4 @@
 %{!?dotnet_assembly_path: %define dotnet_assembly_path /opt/usr/share/dotnet.tizen/framework}
-%{!?dotnet_core_path: %define dotnet_core_path %{_datadir}/tizen.net/ref}
 
 %if 0%{?tizen_build_devel_mode}
 %define BUILDCONF Debug
@@ -9,7 +8,7 @@
 
 Name:       csapi-telephony
 Summary:    Tizen Telephony API for C#
-Version:    1.0.0
+Version:    1.0.1
 Release:    1
 Group:      Development/Libraries
 License:    Apache-2.0
@@ -17,68 +16,46 @@ URL:        https://www.tizen.org
 Source0:    %{name}-%{version}.tar.gz
 Source1:    %{name}.manifest
 
-# Mono
+AutoReqProv: no
+
 BuildRequires: mono-compiler
 BuildRequires: mono-devel
 
-# .NETCore
-%if 0%{?_with_corefx}
-AutoReqProv: no
-BuildRequires: corefx-managed-32b-ref
-%endif
-
 BuildRequires: dotnet-build-tools
 
 # C# API Requries
-BuildRequires: csapi-tizen-devel
+BuildRequires: csapi-tizen-nuget
 
 %description
 Tizen Telephony API for C#
 
 %prep
 %setup -q
-
 cp %{SOURCE1} .
 
 %define Assemblies Tizen.Telephony
 
 %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
-%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
-%endif
-
-# Make NuGet package
-dotnet-gbs pack $ASM/$ASM.nuspec --PackageVersion=%{version} --PackageFiles=$ASM/bin
-
+# NuGet Restore
+find $ASM/*.project.json -exec nuget restore {} \;
+# Build
+find $ASM/*.csproj -exec xbuild {} /p:Configuration=%{BUILDCONF} \;
+# NuGet Pack
+nuget pack $ASM/$ASM.nuspec -Version %{version} -Properties Configuration=%{BUILDCONF}
 done
 
 %install
-mkdir -p %{buildroot}%{dotnet_assembly_path}/devel
+# Runtime Binary
+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}
+  install -p -m 644 $ASM/bin/%{BUILDCONF}/$ASM.dll %{buildroot}%{dotnet_assembly_path}
 %else
-  install -p -m 644 $ASM/bin/net45/$ASM.dll %{buildroot}%{dotnet_assembly_path}
+  install -p -m 644 $ASM/bin/%{BUILDCONF}/Net45/$ASM.dll %{buildroot}%{dotnet_assembly_path}
 %endif
 done
-
+# NuGet
 mkdir -p %{buildroot}/nuget
 install -p -m 644 *.nupkg %{buildroot}/nuget
 
@@ -87,22 +64,9 @@ install -p -m 644 *.nupkg %{buildroot}/nuget
 %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}