Use nuget restore to solve dependencies

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

diff --git a/packaging/csapi-widget-control.spec b/packaging/csapi-widget-control.spec
index 122375a667fbb482974c2e0e86821fd480ef6348..d3708039429a501d3ca88ed8f31ce702b0276b2c 100755 (executable)
--- a/packaging/csapi-widget-control.spec
+++ b/packaging/csapi-widget-control.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-widget-control
 Summary:    Tizen widget control API for C#
-Version:    1.0.0
+Version:    1.0.1
 Release:    1
 Group:      Development/Libraries
 License:    Apache-2.0
@@ -17,21 +16,16 @@ 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-application-devel
+BuildRequires: csapi-tizen-nuget
+BuildRequires: csapi-application-nuget
 
 
 %description
@@ -44,42 +38,26 @@ cp %{SOURCE1} .
 %define Assemblies Tizen.Applications.WidgetControl
 
 %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
 
@@ -88,22 +66,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.Applications.WidgetControl/Tizen.Applications.WidgetControl.Net45.csproj b/src/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.Net45.csproj
index 05d43ee9b7b132b3cf1cdffdd41ba4eed03a3055..9c09aaa48a75d7639044557118e7ccf5c127d166 100644 (file)
--- a/src/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.Net45.csproj
+++ b/src/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.Net45.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>\r
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProjectGuid>{07A0D110-3092-4A09-BF85-95555C7E7DFF}</ProjectGuid>\r
+    <ProjectGuid>{508D0977-8D29-4F8C-86B4-6BBF47B6DD54}</ProjectGuid>\r
     <OutputType>Library</OutputType>\r
     <AppDesignerFolder>Properties</AppDesignerFolder>\r
     <RootNamespace>\r
@@ -64,7 +64,6 @@
   <ItemGroup>\r
     <CodeAnalysisDictionary Include="CustomDictionary.xml" />\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.\r
        Other similar extension points exist, see Microsoft.Common.targets.\r
@@ -73,4 +72,4 @@
   <Target Name="AfterBuild">\r
   </Target>\r
   -->\r
-</Project>\r
+</Project>
\ No newline at end of file

diff --git a/src/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.Net45.project.json b/src/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.Net45.project.json
index d8f9efcfb0ce840d17eca332afce5d1af5392f6c..21ab9e8740c8ef8979cc4e5fee7a0693d4a1db3b 100644 (file)
--- a/src/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.Net45.project.json
+++ b/src/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.Net45.project.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "Tizen": "1.0.0",
-    "Tizen.Applications": "1.0.0",
+    "Tizen": "1.0.1",
+    "Tizen.Applications": "1.0.1",
   },
   "frameworks": {
     "net45": {}

diff --git a/src/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.csproj b/src/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.csproj
old mode 100755 (executable)
new mode 100644 (file)
index be77df9..60b5f27
--- a/src/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.csproj
+++ b/src/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.csproj
@@ -6,7 +6,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
     <ProductVersion>8.0.30703</ProductVersion>\r
     <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{A667ADA4-E7DB-4E45-9D31-491024750EE1}</ProjectGuid>\r
+    <ProjectGuid>{90467170-27D6-4177-B55F-FF78529F9795}</ProjectGuid>\r
     <OutputType>Library</OutputType>\r
     <AppDesignerFolder>Properties</AppDesignerFolder>\r
     <RootNamespace>Tizen.Applications.WidgetControl</RootNamespace>\r
@@ -16,9 +16,8 @@
   </PropertyGroup>\r
   <PropertyGroup>\r
     <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>\r
-    <TargetFrameworkVersion>v1.6</TargetFrameworkVersion>\r
-    <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker>\r
-    <TargetFrameworkMoniker>.NETStandard,Version=v1.6</TargetFrameworkMoniker>\r
+    <TargetFrameworkVersion>v1.3</TargetFrameworkVersion>\r
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>\r
     <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
     <NoStdLib>true</NoStdLib>\r
     <NoWarn>$(NoWarn);1701</NoWarn>\r
@@ -59,7 +58,6 @@
     <Compile Include="Tizen.Applications\WidgetControl.cs" />\r
     <Compile Include="Tizen.Applications\WidgetLifecycleEventArgs.cs" />\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.\r
        Other similar extension points exist, see Microsoft.Common.targets.\r
@@ -80,29 +78,4 @@
     <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)</_FullFrameworkReferenceAssemblyPaths>\r
     <AutoUnifyAssemblyReferences>true</AutoUnifyAssemblyReferences>\r
   </PropertyGroup>\r
-  <!-- Include tasks for Tizen -->\r
-  <PropertyGroup>\r
-    <TizenBuildPath>$(MSBuildExtensionsPath)\Tizen</TizenBuildPath>\r
-    <TizenToolsPath>$(TizenBuildPath)\bin</TizenToolsPath>\r
-  </PropertyGroup>\r
-  <UsingTask TaskName="Tizen.Tasks.SignPackage.TizenCleanPackageSource" AssemblyFile="$(TizenToolsPath)\Tizen.Tasks.SignPackage.dll" />\r
-  <UsingTask TaskName="Tizen.Tasks.SignPackage.TizenPreparePackageManifest" AssemblyFile="$(TizenToolsPath)\Tizen.Tasks.SignPackage.dll" />\r
-  <UsingTask TaskName="Tizen.Tasks.SignPackage.TizenPreparePackageSource" AssemblyFile="$(TizenToolsPath)\Tizen.Tasks.SignPackage.dll" />\r
-  <UsingTask TaskName="Tizen.Tasks.SignPackage.TizenSignPackage" AssemblyFile="$(TizenToolsPath)\Tizen.Tasks.SignPackage.dll" />\r
-  <!-- Task to clean package source -->\r
-  <Target Name="_TizenCleanPkgSrc">\r
-    <TizenCleanPackageSource SolutionPath="$(SolutionPath)" ProjectPath="$(MSBuildProjectFullPath)" />\r
-  </Target>\r
-  <!-- Task to prepare tizen-manifest.xml file -->\r
-  <Target Name="_TizenPrepManifest">\r
-    <TizenPreparePackageManifest SolutionPath="$(SolutionPath)" ProjectPath="$(MSBuildProjectFullPath)" />\r
-  </Target>\r
-  <!-- Task to prepare package sources(executable, dlls, resource files) -->\r
-  <Target Name="_TizenPrepPkgSrc">\r
-    <TizenPreparePackageSource SolutionPath="$(SolutionPath)" ProjectPath="$(MSBuildProjectFullPath)" AssemblyName="$(AssemblyName)" TargetPath="$(TargetPath)" />\r
-  </Target>\r
-  <!-- Task to signing and packaging -->\r
-  <Target Name="_TizenSignPackge">\r
-    <TizenSignPackage SolutionPath="$(SolutionPath)" ProjectPath="$(MSBuildProjectFullPath)" SolutionName="$(SolutionName)" AuthorCertificate="$(AuthorCertificate)" AuthorPasswd="$(AuthorPasswd)" DistribCertificate="$(DistribCertificate)" DistribPasswd="$(DistribPasswd)" />\r
-  </Target>\r
-</Project>\r
+</Project>
\ No newline at end of file

diff --git a/src/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.nuspec b/src/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.nuspec
index cf46c887bbf259d194e498a25dda73cd99fcf383..7be3997936fc0b2cbafdf6e21174c0558ecf4011 100644 (file)
--- a/src/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.nuspec
+++ b/src/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.nuspec
@@ -1,13 +1,17 @@
 <?xml version="1.0"?>
 <package>
   <metadata>
-               <id>Tizen.Applications.WidgetControl</id>
-               <version>$version$</version>
-               <authors>Tizen Developers</authors>
-               <description>Widget control API for Tizen.Net</description>
+    <id>Tizen.Applications.WidgetControl</id>
+    <version>$version$</version>
+    <authors>Tizen Developers</authors>
+    <description>Widget control API for Tizen.Net</description>
     <dependencies>
-        <dependency id="Tizen" version="1.0.0" />
-        <dependency id="Tizen.Applications" version="1.0.0" />
+      <dependency id="Tizen" version="1.0.1" />
+      <dependency id="Tizen.Applications" version="1.0.1" />
     </dependencies>
-       </metadata>
+  </metadata>
+  <files>
+    <file src="bin/$Configuration$/Tizen.Applications.WidgetControl.dll" target="lib/netstandard1.3" />
+    <file src="bin/$Configuration$/Net45/Tizen.Applications.WidgetControl.dll" target="lib/net45" />
+  </files>
 </package>

diff --git a/src/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.project.json b/src/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.project.json
index a9f948a142897a729546bb19dbb098fb67c25d63..844a5febf31f1625da2cdfc83af610edaa29b0b4 100755 (executable)
--- a/src/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.project.json
+++ b/src/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.project.json
@@ -1,18 +1,10 @@
 {\r
-  "buildOptions": {\r
-    "debugType": "portable",\r
-    "platform": "AnyCPU",\r
-    "preserveCompilationContext": true\r
-  },\r
   "dependencies": {\r
     "NETStandard.Library": "1.6.0",\r
-    "Tizen": "1.0.0",\r
-    "Tizen.Applications": "1.0.0"\r
-  },\r
-  "runtimes": {\r
-    "win": {}\r
+    "Tizen": "1.0.1",\r
+    "Tizen.Applications": "1.0.1"\r
   },\r
   "frameworks": {\r
-    "netstandard1.6": {}\r
+    "netstandard1.3": {}\r
   }\r
 }
\ No newline at end of file