diff options
author | WonYoung Choi <wy80.choi@samsung.com> | 2016-10-04 22:00:29 +0900 |
---|---|---|
committer | WonYoung Choi <wy80.choi@samsung.com> | 2016-10-05 18:38:54 +0900 |
commit | c9a9a84923f40075e5393aef20d374eebdd2308f (patch) | |
tree | 65bc251c6fadfbd411a6c09a32fbfa3bb9da8169 | |
parent | e466c7182b9a5a1f0691fc83543635c4b5224fa6 (diff) | |
download | media-content-c9a9a84923f40075e5393aef20d374eebdd2308f.tar.gz media-content-c9a9a84923f40075e5393aef20d374eebdd2308f.tar.bz2 media-content-c9a9a84923f40075e5393aef20d374eebdd2308f.zip |
Use nuget restore to solve dependencies
Change-Id: I66d1d6a1e86c7892f3c301e75c04641346e3114c
Signed-off-by: WonYoung Choi <wy80.choi@samsung.com>
6 files changed, 42 insertions, 78 deletions
diff --git a/Tizen.Content.MediaContent/Tizen.Content.MediaContent.Net45.csproj b/Tizen.Content.MediaContent/Tizen.Content.MediaContent.Net45.csproj index 3a899b7..d654d22 100644 --- a/Tizen.Content.MediaContent/Tizen.Content.MediaContent.Net45.csproj +++ b/Tizen.Content.MediaContent/Tizen.Content.MediaContent.Net45.csproj @@ -79,13 +79,12 @@ <None Include="Tizen.Content.MediaContent.nuspec" />
<None Include="Tizen.Content.MediaContent.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. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> + <!-- 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>
-->
</Project>
\ No newline at end of file diff --git a/Tizen.Content.MediaContent/Tizen.Content.MediaContent.Net45.project.json b/Tizen.Content.MediaContent/Tizen.Content.MediaContent.Net45.project.json index d9af4f0..ab1a0ee 100644 --- a/Tizen.Content.MediaContent/Tizen.Content.MediaContent.Net45.project.json +++ b/Tizen.Content.MediaContent/Tizen.Content.MediaContent.Net45.project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Tizen": "1.0.0" + "Tizen": "1.0.1" }, "frameworks": { "net45": {} diff --git a/Tizen.Content.MediaContent/Tizen.Content.MediaContent.csproj b/Tizen.Content.MediaContent/Tizen.Content.MediaContent.csproj index 7c8f344..5f6c061 100644 --- a/Tizen.Content.MediaContent/Tizen.Content.MediaContent.csproj +++ b/Tizen.Content.MediaContent/Tizen.Content.MediaContent.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>
@@ -88,22 +88,21 @@ <None Include="Tizen.Content.MediaContent.project.json" />
<None Include="Tizen.Content.MediaContent.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. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> + <!-- 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>
-->
<PropertyGroup>
- <!-- https://github.com/dotnet/corefxlab/tree/master/samples/NetCoreSample and - https://docs.microsoft.com/en-us/dotnet/articles/core/tutorials/target-dotnetcore-with-msbuild + <!-- https://github.com/dotnet/corefxlab/tree/master/samples/NetCoreSample and
+ https://docs.microsoft.com/en-us/dotnet/articles/core/tutorials/target-dotnetcore-with-msbuild
-->
- <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two - properties to any folder that exists to skip the GetReferenceAssemblyPaths task (not target) and - to prevent it from outputting a warning (MSB3644). + <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two
+ properties to any folder that exists to skip the GetReferenceAssemblyPaths task (not target) and
+ to prevent it from outputting a warning (MSB3644).
-->
<_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)</_TargetFrameworkDirectories>
<_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)</_FullFrameworkReferenceAssemblyPaths>
diff --git a/Tizen.Content.MediaContent/Tizen.Content.MediaContent.nuspec b/Tizen.Content.MediaContent/Tizen.Content.MediaContent.nuspec index 0596feb..5fb32f6 100644 --- a/Tizen.Content.MediaContent/Tizen.Content.MediaContent.nuspec +++ b/Tizen.Content.MediaContent/Tizen.Content.MediaContent.nuspec @@ -6,7 +6,11 @@ <authors>Tizen Developers</authors> <description>Media Content 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.Content.MediaContent.dll" target="lib/netstandard1.3" /> + <file src="bin/$Configuration$/Net45/Tizen.Content.MediaContent.dll" target="lib/net45" /> + </files> </package> diff --git a/Tizen.Content.MediaContent/Tizen.Content.MediaContent.project.json b/Tizen.Content.MediaContent/Tizen.Content.MediaContent.project.json index 43034ac..6a7437d 100644 --- a/Tizen.Content.MediaContent/Tizen.Content.MediaContent.project.json +++ b/Tizen.Content.MediaContent/Tizen.Content.MediaContent.project.json @@ -2,12 +2,9 @@ "dependencies": { "NETStandard.Library": "1.6.0", "System.Threading.Thread": "4.0.0", - "Tizen": "1.0.0" + "Tizen": "1.0.1" }, "frameworks": { - "netstandard1.6": {} - }, - "runtimes": { - "win": {} + "netstandard1.3": {} } } diff --git a/packaging/csapi-media-content.spec b/packaging/csapi-media-content.spec index 8810115..9405c2d 100755 --- a/packaging/csapi-media-content.spec +++ b/packaging/csapi-media-content.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-media-content Summary: Tizen Media Content 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 Media Content API for C# @@ -42,42 +36,26 @@ cp %{SOURCE1} . %define Assemblies Tizen.Content.MediaContent %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} |