diff options
author | WonYoung Choi <wy80.choi@samsung.com> | 2016-10-04 23:31:29 +0900 |
---|---|---|
committer | WonYoung Choi <wy80.choi@samsung.com> | 2016-10-04 23:31:29 +0900 |
commit | 8bb8929c21e2217b7c2322638e19d5eb78ee3626 (patch) | |
tree | e3cde690668ecf0e520b4ae63018af721935d3ed | |
parent | 0978c6a486e4322d40d268020a1017c978ee3ee3 (diff) | |
download | media-key-8bb8929c21e2217b7c2322638e19d5eb78ee3626.tar.gz media-key-8bb8929c21e2217b7c2322638e19d5eb78ee3626.tar.bz2 media-key-8bb8929c21e2217b7c2322638e19d5eb78ee3626.zip |
Use nuget restore to solve dependencies
Change-Id: If5f44d40ef021d5af34a4d0b9506297fecc9771d
Signed-off-by: WonYoung Choi <wy80.choi@samsung.com>
6 files changed, 42 insertions, 80 deletions
diff --git a/Tizen.System.MediaKey/Tizen.System.MediaKey.Net45.csproj b/Tizen.System.MediaKey/Tizen.System.MediaKey.Net45.csproj index 3b6d6f2..62c6c59 100644 --- a/Tizen.System.MediaKey/Tizen.System.MediaKey.Net45.csproj +++ b/Tizen.System.MediaKey/Tizen.System.MediaKey.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>{DA0F2227-9343-443E-BF51-744ED9422C2E}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
@@ -64,13 +64,12 @@ <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. - <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.System.MediaKey/Tizen.System.MediaKey.Net45.project.json b/Tizen.System.MediaKey/Tizen.System.MediaKey.Net45.project.json index d9af4f0..ab1a0ee 100644 --- a/Tizen.System.MediaKey/Tizen.System.MediaKey.Net45.project.json +++ b/Tizen.System.MediaKey/Tizen.System.MediaKey.Net45.project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Tizen": "1.0.0" + "Tizen": "1.0.1" }, "frameworks": { "net45": {} diff --git a/Tizen.System.MediaKey/Tizen.System.MediaKey.csproj b/Tizen.System.MediaKey/Tizen.System.MediaKey.csproj index 2a822fe..8905b20 100644 --- a/Tizen.System.MediaKey/Tizen.System.MediaKey.csproj +++ b/Tizen.System.MediaKey/Tizen.System.MediaKey.csproj @@ -3,7 +3,7 @@ <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProjectGuid>{A667ADA4-E7DB-4E45-9D31-491024750EE1}</ProjectGuid>
+ <ProjectGuid>{C620873C-5722-4439-B570-45A83AF8A405}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
@@ -13,8 +13,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>
@@ -63,22 +63,21 @@ <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. - <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.System.MediaKey/Tizen.System.MediaKey.nuspec b/Tizen.System.MediaKey/Tizen.System.MediaKey.nuspec index 8ae5f76..413ac11 100644 --- a/Tizen.System.MediaKey/Tizen.System.MediaKey.nuspec +++ b/Tizen.System.MediaKey/Tizen.System.MediaKey.nuspec @@ -6,7 +6,11 @@ <authors>Tizen Developers</authors> <description>MediaKey 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.System.MediaKey.dll" target="lib/netstandard1.3" /> + <file src="bin/$Configuration$/Net45/Tizen.System.MediaKey.dll" target="lib/net45" /> + </files> </package> diff --git a/Tizen.System.MediaKey/Tizen.System.MediaKey.project.json b/Tizen.System.MediaKey/Tizen.System.MediaKey.project.json index beb9e15..db7436c 100644 --- a/Tizen.System.MediaKey/Tizen.System.MediaKey.project.json +++ b/Tizen.System.MediaKey/Tizen.System.MediaKey.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": {} } } diff --git a/packaging/csapi-media-key.spec b/packaging/csapi-media-key.spec index 89dc25b..3913413 100755 --- a/packaging/csapi-media-key.spec +++ b/packaging/csapi-media-key.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-key Summary: Tizen Media Key API for C# -Version: 1.0.0 +Version: 1.0.1 Release: 1 Group: Development/Libraries License: Apache-2.0 @@ -17,20 +16,13 @@ URL: https://www.tizen.org Source0: %{name}-%{version}.tar.gz Source1: %{name}.manifest -# Mono 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-tizen-nuget %description Tizen Media Key API for C# @@ -42,42 +34,26 @@ cp %{SOURCE1} . %define Assemblies Tizen.System.MediaKey %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 +62,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} |