Use dotnet build macros

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

diff --git a/packaging/csapi-account-fido-client.spec b/packaging/csapi-account-fido-client.spec
index bc92060..da50517 100755 (executable)
--- a/packaging/csapi-account-fido-client.spec
+++ b/packaging/csapi-account-fido-client.spec
@@ -1,14 +1,6 @@
-%{!?dotnet_assembly_path: %define dotnet_assembly_path /opt/usr/share/dotnet.tizen/framework}
-
-%if 0%{?tizen_build_devel_mode}
-%define BUILDCONF Debug
-%else
-%define BUILDCONF Release
-%endif
-
 Name:       csapi-account-fido-client
 Summary:    FIDO UAF C# API for Tizen
-Version:    1.0.2
+Version:    1.0.3
 Release:    1
 Group:      Development/Libraries
 License:    Apache-2.0
@@ -19,59 +11,34 @@ Source1:    %{name}.manifest
 AutoReqProv: no
 ExcludeArch: aarch64
 
-BuildRequires: mono-compiler
-BuildRequires: mono-devel
-
 BuildRequires: dotnet-build-tools
 
 # NuGet for Dependencies
 BuildRequires: csapi-tizen-nuget
 
+%define Assemblies Tizen.Account.FidoClient
 
 %description
-FIDO UAF C# API for Tizen
+%{summary}
+
+%dotnet_import_sub_packages
 
 %prep
 %setup -q
 cp %{SOURCE1} .
 
-%define Assemblies Tizen.Account.FidoClient
-
 %build
 for ASM in %{Assemblies}; do
-# 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}
+%dotnet_build $ASM
+%dotnet_pack $ASM/$ASM.nuspec %{version}
 done
 
 %install
-# Runtime Binary
-mkdir -p %{buildroot}%{dotnet_assembly_path}
 for ASM in %{Assemblies}; do
-%if 0%{?_with_corefx}
-  install -p -m 644 $ASM/bin/%{BUILDCONF}/$ASM.dll %{buildroot}%{dotnet_assembly_path}
-%else
-  install -p -m 644 $ASM/bin/%{BUILDCONF}/Net45/$ASM.dll %{buildroot}%{dotnet_assembly_path}
-%endif
+%dotnet_install $ASM
 done
-# NuGet
-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 nuget
-Summary:   NuGet package for %{name}
-Group:     Development/Libraries
-
-%description nuget
-NuGet package for %{name}
-
-%files nuget
-/nuget/*.nupkg
+%attr(644,root,root) %{dotnet_assembly_files}

diff --git a/src/Tizen.Account.FidoClient/Tizen.Account.FidoClient.nuspec b/src/Tizen.Account.FidoClient/Tizen.Account.FidoClient.nuspec
index f8f7b4d..9ff6b96 100755 (executable)
--- a/src/Tizen.Account.FidoClient/Tizen.Account.FidoClient.nuspec
+++ b/src/Tizen.Account.FidoClient/Tizen.Account.FidoClient.nuspec
@@ -15,6 +15,6 @@
     </dependencies>
        </metadata>
   <files>
-    <file src="bin/$Configuration$/Tizen.Account.FidoClient.dll" target="lib/netstandard1.3" />
+    <file src="bin/$Configuration$/Tizen.Account.FidoClient.dll" target="lib/netstandard1.6" />
   </files>
 </package>

diff --git a/src/Tizen.Account.FidoClient/Tizen.Account.FidoClient.project.json b/src/Tizen.Account.FidoClient/Tizen.Account.FidoClient.project.json
index aef135d..7229437 100755 (executable)
--- a/src/Tizen.Account.FidoClient/Tizen.Account.FidoClient.project.json
+++ b/src/Tizen.Account.FidoClient/Tizen.Account.FidoClient.project.json
@@ -1,15 +1,7 @@
 {
-  "buildOptions": {
-    "debugType": "portable",
-    "platform": "AnyCPU",
-    "preserveCompilationContext": true
-  },
   "dependencies": {
     "NETStandard.Library": "1.6.0",
-    "Tizen": "1.0.1"
-  },
-  "runtimes": {
-    "win": {}
+    "Tizen": "1.0.3"
   },
   "frameworks": {
     "netstandard1.6": {}