From c53dcee91a3bd84c3f106dacbe4bb6d73102d412 Mon Sep 17 00:00:00 2001 From: WonYoung Choi Date: Tue, 4 Oct 2016 23:21:02 +0900 Subject: [PATCH] Use nuget restore to solve dependencies Change-Id: Ic4232c0f07b934f18214538ec85b80f0ec60f733 Signed-off-by: WonYoung Choi --- packaging/csapi-trace.spec | 65 +++-------- src/Tizen.Tracer/Tizen.Tracer.Net45.csproj | 5 +- src/Tizen.Tracer/Tizen.Tracer.Net45.project.json | 2 +- src/Tizen.Tracer/Tizen.Tracer.csproj | 135 +++++++++++------------ src/Tizen.Tracer/Tizen.Tracer.nuspec | 6 +- src/Tizen.Tracer/Tizen.Tracer.project.json | 7 +- 6 files changed, 92 insertions(+), 128 deletions(-) diff --git a/packaging/csapi-trace.spec b/packaging/csapi-trace.spec index fa66794..a81739e 100644 --- a/packaging/csapi-trace.spec +++ b/packaging/csapi-trace.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-trace Summary: Tizen Tracer API for C# -Version: 1.0.0 +Version: 1.0.1 Release: 1 Group: Development/Libraries License: Apache-2.0 @@ -17,20 +16,15 @@ 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 Requires -BuildRequires: csapi-tizen-devel +BuildRequires: csapi-tizen-nuget %description Tizen Tracer API for C# @@ -42,42 +36,26 @@ cp %{SOURCE1} . %define Assemblies Tizen.Tracer %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 @@ -86,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} diff --git a/src/Tizen.Tracer/Tizen.Tracer.Net45.csproj b/src/Tizen.Tracer/Tizen.Tracer.Net45.csproj index 775a346..4fd4b7a 100644 --- a/src/Tizen.Tracer/Tizen.Tracer.Net45.csproj +++ b/src/Tizen.Tracer/Tizen.Tracer.Net45.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - {20C210FC-AE4F-411F-9BA9-8DD900ED61DB} + {D6ED1942-9F12-4F29-BB73-60E90B2DC612} Library Tizen.Tracer Tizen.Tracer @@ -58,7 +58,6 @@ - - \ No newline at end of file + diff --git a/src/Tizen.Tracer/Tizen.Tracer.Net45.project.json b/src/Tizen.Tracer/Tizen.Tracer.Net45.project.json index d9af4f0..ab1a0ee 100644 --- a/src/Tizen.Tracer/Tizen.Tracer.Net45.project.json +++ b/src/Tizen.Tracer/Tizen.Tracer.Net45.project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Tizen": "1.0.0" + "Tizen": "1.0.1" }, "frameworks": { "net45": {} diff --git a/src/Tizen.Tracer/Tizen.Tracer.csproj b/src/Tizen.Tracer/Tizen.Tracer.csproj index 8a47d25..2c147ab 100644 --- a/src/Tizen.Tracer/Tizen.Tracer.csproj +++ b/src/Tizen.Tracer/Tizen.Tracer.csproj @@ -1,79 +1,78 @@ - - - - Debug - AnyCPU - {20C210FC-AE4F-411F-9BA9-8DD900ED61DB} - Library - Tizen.Tracer - Tizen.Tracer - 512 - - - .NETStandard - v1.6 - .NETStandard,Version=v1.6 - false - true - $(NoWarn);1701;1702 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - false - - - true - - - Tizen.Tracer.snk - - - - - - - - - - - - - - + + + + Debug + AnyCPU + {20C210FC-AE4F-411F-9BA9-8DD900ED61DB} + Library + Tizen.Tracer + Tizen.Tracer + 512 + + + .NETStandard + v1.3 + .NETStandard,Version=v1.3 + false + true + $(NoWarn);1701;1702 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + false + false + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + false + false + + + true + + + Tizen.Tracer.snk + + + + + + + + + + + + + - + --> + + --> - <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory) - <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory) - true - - \ No newline at end of file + --> + <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory) + <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory) + true + + diff --git a/src/Tizen.Tracer/Tizen.Tracer.nuspec b/src/Tizen.Tracer/Tizen.Tracer.nuspec index 6ce0030..5e9f781 100644 --- a/src/Tizen.Tracer/Tizen.Tracer.nuspec +++ b/src/Tizen.Tracer/Tizen.Tracer.nuspec @@ -6,7 +6,11 @@ Tizen Developers Tracing API for Tizen.Net - + + + + + diff --git a/src/Tizen.Tracer/Tizen.Tracer.project.json b/src/Tizen.Tracer/Tizen.Tracer.project.json index beb9e15..db7436c 100644 --- a/src/Tizen.Tracer/Tizen.Tracer.project.json +++ b/src/Tizen.Tracer/Tizen.Tracer.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": {} } } -- 2.7.4