diff options
author | WonYoung Choi <wy80.choi@samsung.com> | 2016-10-04 23:34:31 +0900 |
---|---|---|
committer | WonYoung Choi <wy80.choi@samsung.com> | 2016-10-06 20:32:53 +0900 |
commit | f957dadf03c02fe13e2b0c0e8bd80633960ba4be (patch) | |
tree | 684a38399feb32d9b6e204da0a536a5aa42deda3 | |
parent | 780a47e832e9e9ea0b15d06efa916049b768b3d6 (diff) | |
download | widget-control-f957dadf03c02fe13e2b0c0e8bd80633960ba4be.tar.gz widget-control-f957dadf03c02fe13e2b0c0e8bd80633960ba4be.tar.bz2 widget-control-f957dadf03c02fe13e2b0c0e8bd80633960ba4be.zip |
Use nuget restore to solve dependencies
Change-Id: Id07351cbaaf1b480b6d560e0d1bd25ad241824b9
Signed-off-by: WonYoung Choi <wy80.choi@samsung.com>
6 files changed, 38 insertions, 105 deletions
diff --git a/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.Net45.csproj b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.Net45.csproj index 05d43ee..9c09aaa 100644 --- a/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.Net45.csproj +++ b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.Net45.csproj @@ -3,7 +3,7 @@ <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProjectGuid>{07A0D110-3092-4A09-BF85-95555C7E7DFF}</ProjectGuid>
+ <ProjectGuid>{508D0977-8D29-4F8C-86B4-6BBF47B6DD54}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
@@ -64,7 +64,6 @@ <ItemGroup>
<CodeAnalysisDictionary Include="CustomDictionary.xml" />
</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.
Other similar extension points exist, see Microsoft.Common.targets.
@@ -73,4 +72,4 @@ <Target Name="AfterBuild">
</Target>
-->
-</Project>
+</Project>
\ No newline at end of file diff --git a/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.Net45.project.json b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.Net45.project.json index d8f9efc..21ab9e8 100644 --- a/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.Net45.project.json +++ b/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/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.csproj b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.csproj index be77df9..60b5f27 100755..100644 --- a/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.csproj +++ b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.csproj @@ -6,7 +6,7 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{A667ADA4-E7DB-4E45-9D31-491024750EE1}</ProjectGuid>
+ <ProjectGuid>{90467170-27D6-4177-B55F-FF78529F9795}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Tizen.Applications.WidgetControl</RootNamespace>
@@ -16,9 +16,8 @@ </PropertyGroup>
<PropertyGroup>
<TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>
- <TargetFrameworkVersion>v1.6</TargetFrameworkVersion>
- <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker>
- <TargetFrameworkMoniker>.NETStandard,Version=v1.6</TargetFrameworkMoniker>
+ <TargetFrameworkVersion>v1.3</TargetFrameworkVersion>
+ <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
<NoStdLib>true</NoStdLib>
<NoWarn>$(NoWarn);1701</NoWarn>
@@ -59,7 +58,6 @@ <Compile Include="Tizen.Applications\WidgetControl.cs" />
<Compile Include="Tizen.Applications\WidgetLifecycleEventArgs.cs" />
</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.
Other similar extension points exist, see Microsoft.Common.targets.
@@ -80,29 +78,4 @@ <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)</_FullFrameworkReferenceAssemblyPaths>
<AutoUnifyAssemblyReferences>true</AutoUnifyAssemblyReferences>
</PropertyGroup>
- <!-- Include tasks for Tizen -->
- <PropertyGroup>
- <TizenBuildPath>$(MSBuildExtensionsPath)\Tizen</TizenBuildPath>
- <TizenToolsPath>$(TizenBuildPath)\bin</TizenToolsPath>
- </PropertyGroup>
- <UsingTask TaskName="Tizen.Tasks.SignPackage.TizenCleanPackageSource" AssemblyFile="$(TizenToolsPath)\Tizen.Tasks.SignPackage.dll" />
- <UsingTask TaskName="Tizen.Tasks.SignPackage.TizenPreparePackageManifest" AssemblyFile="$(TizenToolsPath)\Tizen.Tasks.SignPackage.dll" />
- <UsingTask TaskName="Tizen.Tasks.SignPackage.TizenPreparePackageSource" AssemblyFile="$(TizenToolsPath)\Tizen.Tasks.SignPackage.dll" />
- <UsingTask TaskName="Tizen.Tasks.SignPackage.TizenSignPackage" AssemblyFile="$(TizenToolsPath)\Tizen.Tasks.SignPackage.dll" />
- <!-- Task to clean package source -->
- <Target Name="_TizenCleanPkgSrc">
- <TizenCleanPackageSource SolutionPath="$(SolutionPath)" ProjectPath="$(MSBuildProjectFullPath)" />
- </Target>
- <!-- Task to prepare tizen-manifest.xml file -->
- <Target Name="_TizenPrepManifest">
- <TizenPreparePackageManifest SolutionPath="$(SolutionPath)" ProjectPath="$(MSBuildProjectFullPath)" />
- </Target>
- <!-- Task to prepare package sources(executable, dlls, resource files) -->
- <Target Name="_TizenPrepPkgSrc">
- <TizenPreparePackageSource SolutionPath="$(SolutionPath)" ProjectPath="$(MSBuildProjectFullPath)" AssemblyName="$(AssemblyName)" TargetPath="$(TargetPath)" />
- </Target>
- <!-- Task to signing and packaging -->
- <Target Name="_TizenSignPackge">
- <TizenSignPackage SolutionPath="$(SolutionPath)" ProjectPath="$(MSBuildProjectFullPath)" SolutionName="$(SolutionName)" AuthorCertificate="$(AuthorCertificate)" AuthorPasswd="$(AuthorPasswd)" DistribCertificate="$(DistribCertificate)" DistribPasswd="$(DistribPasswd)" />
- </Target>
-</Project>
+</Project>
\ No newline at end of file diff --git a/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.nuspec b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.nuspec index cf46c88..7be3997 100644 --- a/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.nuspec +++ b/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/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.project.json b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.project.json index a9f948a..844a5fe 100755 --- a/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.project.json +++ b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.project.json @@ -1,18 +1,10 @@ {
- "buildOptions": {
- "debugType": "portable",
- "platform": "AnyCPU",
- "preserveCompilationContext": true
- },
"dependencies": {
"NETStandard.Library": "1.6.0",
- "Tizen": "1.0.0",
- "Tizen.Applications": "1.0.0"
- },
- "runtimes": {
- "win": {}
+ "Tizen": "1.0.1",
+ "Tizen.Applications": "1.0.1"
},
"frameworks": {
- "netstandard1.6": {}
+ "netstandard1.3": {}
}
}
\ No newline at end of file diff --git a/packaging/csapi-widget-control.spec b/packaging/csapi-widget-control.spec index 122375a..d370803 100755 --- 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} |