diff options
author | WonYoung Choi <wy80.choi@samsung.com> | 2016-09-03 15:54:09 +0900 |
---|---|---|
committer | WonYoung Choi <wy80.choi@samsung.com> | 2016-09-03 15:54:09 +0900 |
commit | 0978c6a486e4322d40d268020a1017c978ee3ee3 (patch) | |
tree | 4b2b1cad4d0d452cc79a6b0e4363fc7d48ecffc8 | |
parent | fcf363f1dbdccdaf281e957982a01ed5e02cbfcb (diff) | |
download | media-key-0978c6a486e4322d40d268020a1017c978ee3ee3.tar.gz media-key-0978c6a486e4322d40d268020a1017c978ee3ee3.tar.bz2 media-key-0978c6a486e4322d40d268020a1017c978ee3ee3.zip |
Fix project files to support netstandard 1.6
Change-Id: Ie3a01a8e659b92365bf2c171cda7a6e402805768
Signed-off-by: WonYoung Choi <wy80.choi@samsung.com>
-rw-r--r-- | .gitignore | 7 | ||||
-rw-r--r-- | Tizen.System.MediaKey/CoreFx.References.targets | 265 | ||||
-rw-r--r-- | Tizen.System.MediaKey/Tizen.System.MediaKey.Net45.csproj | 76 | ||||
-rw-r--r-- | Tizen.System.MediaKey/Tizen.System.MediaKey.Net45.project.json | 11 | ||||
-rw-r--r--[-rwxr-xr-x] | Tizen.System.MediaKey/Tizen.System.MediaKey.csproj | 63 | ||||
-rw-r--r-- | Tizen.System.MediaKey/Tizen.System.MediaKey.nuspec | 12 | ||||
-rw-r--r-- | Tizen.System.MediaKey/Tizen.System.MediaKey.project.json | 12 | ||||
-rwxr-xr-x | packaging/csapi-media-key.spec | 68 |
8 files changed, 202 insertions, 312 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..46619d5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +bin/ +obj/ +*.exe +*.dll +*.csproj.user +*.lock.json +.vs/ diff --git a/Tizen.System.MediaKey/CoreFx.References.targets b/Tizen.System.MediaKey/CoreFx.References.targets deleted file mode 100644 index dab29ec..0000000 --- a/Tizen.System.MediaKey/CoreFx.References.targets +++ /dev/null @@ -1,265 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Condition=" '$(CoreFxPath)' != '' "> - <Reference Include="Microsoft.Win32.Primitives"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/Microsoft.Win32.Primitives.dll</HintPath> - </Reference> - <Reference Include="System.AppContext"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.AppContext.dll</HintPath> - </Reference> - <Reference Include="System.Collections.Concurrent"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Collections.Concurrent.dll</HintPath> - </Reference> - <Reference Include="System.Collections"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Collections.dll</HintPath> - </Reference> - <Reference Include="System.ComponentModel.Annotations"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.ComponentModel.Annotations.dll</HintPath> - </Reference> - <Reference Include="System.ComponentModel"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.ComponentModel.dll</HintPath> - </Reference> - <Reference Include="System.Console"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Console.dll</HintPath> - </Reference> - <Reference Include="System.Diagnostics.Debug"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Diagnostics.Debug.dll</HintPath> - </Reference> - <Reference Include="System.Diagnostics.Process"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Diagnostics.Process.dll</HintPath> - </Reference> - <Reference Include="System.Diagnostics.Tools"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Diagnostics.Tools.dll</HintPath> - </Reference> - <Reference Include="System.Diagnostics.TraceSource"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Diagnostics.TraceSource.dll</HintPath> - </Reference> - <Reference Include="System.Diagnostics.Tracing"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Diagnostics.Tracing.dll</HintPath> - </Reference> - <Reference Include="System.Dynamic.Runtime"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Dynamic.Runtime.dll</HintPath> - </Reference> - <Reference Include="System.Globalization.Calendars"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Globalization.Calendars.dll</HintPath> - </Reference> - <Reference Include="System.Globalization"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Globalization.dll</HintPath> - </Reference> - <Reference Include="System.Globalization.Extensions"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Globalization.Extensions.dll</HintPath> - </Reference> - <Reference Include="System.IO.Compression"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.IO.Compression.dll</HintPath> - </Reference> - <Reference Include="System.IO.Compression.ZipFile"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.IO.Compression.ZipFile.dll</HintPath> - </Reference> - <Reference Include="System.IO"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.IO.dll</HintPath> - </Reference> - <Reference Include="System.IO.FileSystem"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.IO.FileSystem.dll</HintPath> - </Reference> - <Reference Include="System.IO.FileSystem.Primitives"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.IO.FileSystem.Primitives.dll</HintPath> - </Reference> - <Reference Include="System.IO.FileSystem.Watcher"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.IO.FileSystem.Watcher.dll</HintPath> - </Reference> - <Reference Include="System.IO.MemoryMappedFiles"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.IO.MemoryMappedFiles.dll</HintPath> - </Reference> - <Reference Include="System.IO.UnmanagedMemoryStream"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.IO.UnmanagedMemoryStream.dll</HintPath> - </Reference> - <Reference Include="System.Linq"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Linq.dll</HintPath> - </Reference> - <Reference Include="System.Linq.Expressions"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Linq.Expressions.dll</HintPath> - </Reference> - <Reference Include="System.Linq.Parallel"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Linq.Parallel.dll</HintPath> - </Reference> - <Reference Include="System.Linq.Queryable"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Linq.Queryable.dll</HintPath> - </Reference> - <Reference Include="System.Net.Http"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Net.Http.dll</HintPath> - </Reference> - <Reference Include="System.Net.NameResolution"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Net.NameResolution.dll</HintPath> - </Reference> - <Reference Include="System.Net.Primitives"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Net.Primitives.dll</HintPath> - </Reference> - <Reference Include="System.Net.Requests"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Net.Requests.dll</HintPath> - </Reference> - <Reference Include="System.Net.Security"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Net.Security.dll</HintPath> - </Reference> - <Reference Include="System.Net.Sockets"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Net.Sockets.dll</HintPath> - </Reference> - <Reference Include="System.Net.WebHeaderCollection"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Net.WebHeaderCollection.dll</HintPath> - </Reference> - <Reference Include="System.Numerics.Vectors"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Numerics.Vectors.dll</HintPath> - </Reference> - <Reference Include="System.ObjectModel"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.ObjectModel.dll</HintPath> - </Reference> - <Reference Include="System.Reflection.DispatchProxy"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Reflection.DispatchProxy.dll</HintPath> - </Reference> - <Reference Include="System.Reflection"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Reflection.dll</HintPath> - </Reference> - <Reference Include="System.Reflection.Extensions"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Reflection.Extensions.dll</HintPath> - </Reference> - <Reference Include="System.Reflection.Primitives"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Reflection.Primitives.dll</HintPath> - </Reference> - <Reference Include="System.Reflection.TypeExtensions"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Reflection.TypeExtensions.dll</HintPath> - </Reference> - <Reference Include="System.Resources.ResourceManager"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Resources.ResourceManager.dll</HintPath> - </Reference> - <Reference Include="System.Runtime"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Runtime.dll</HintPath> - </Reference> - <Reference Include="System.Runtime.Extensions"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Runtime.Extensions.dll</HintPath> - </Reference> - <Reference Include="System.Runtime.Handles"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Runtime.Handles.dll</HintPath> - </Reference> - <Reference Include="System.Runtime.InteropServices"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Runtime.InteropServices.dll</HintPath> - </Reference> - <Reference Include="System.Runtime.InteropServices.RuntimeInformation"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Runtime.InteropServices.RuntimeInformation.dll</HintPath> - </Reference> - <Reference Include="System.Runtime.Loader"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Runtime.Loader.dll</HintPath> - </Reference> - <Reference Include="System.Runtime.Numerics"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Runtime.Numerics.dll</HintPath> - </Reference> - <Reference Include="System.Security.Cryptography.Algorithms"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Security.Cryptography.Algorithms.dll</HintPath> - </Reference> - <Reference Include="System.Security.Cryptography.Encoding"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Security.Cryptography.Encoding.dll</HintPath> - </Reference> - <Reference Include="System.Security.Cryptography.Primitives"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Security.Cryptography.Primitives.dll</HintPath> - </Reference> - <Reference Include="System.Security.Cryptography.X509Certificates"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Security.Cryptography.X509Certificates.dll</HintPath> - </Reference> - <Reference Include="System.Text.Encoding"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Text.Encoding.dll</HintPath> - </Reference> - <Reference Include="System.Text.Encoding.Extensions"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Text.Encoding.Extensions.dll</HintPath> - </Reference> - <Reference Include="System.Text.RegularExpressions"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Text.RegularExpressions.dll</HintPath> - </Reference> - <Reference Include="System.Threading"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Threading.dll</HintPath> - </Reference> - <Reference Include="System.Threading.Tasks"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Threading.Tasks.dll</HintPath> - </Reference> - <Reference Include="System.Threading.Tasks.Parallel"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Threading.Tasks.Parallel.dll</HintPath> - </Reference> - <Reference Include="System.Threading.Thread"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Threading.Thread.dll</HintPath> - </Reference> - <Reference Include="System.Threading.ThreadPool"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Threading.ThreadPool.dll</HintPath> - </Reference> - <Reference Include="System.Threading.Timer"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Threading.Timer.dll</HintPath> - </Reference> - <Reference Include="System.Xml.ReaderWriter"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Xml.ReaderWriter.dll</HintPath> - </Reference> - <Reference Include="System.Xml.XDocument"> - <Private>False</Private> - <HintPath>$(CoreFxPath)/System.Xml.XDocument.dll</HintPath> - </Reference> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/Tizen.System.MediaKey/Tizen.System.MediaKey.Net45.csproj b/Tizen.System.MediaKey/Tizen.System.MediaKey.Net45.csproj new file mode 100644 index 0000000..3b6d6f2 --- /dev/null +++ b/Tizen.System.MediaKey/Tizen.System.MediaKey.Net45.csproj @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>{07A0D110-3092-4A09-BF85-95555C7E7DFF}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>
+ </RootNamespace>
+ <AssemblyName>Tizen.System.MediaKey</AssemblyName>
+ <FileAlignment>512</FileAlignment>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\Net45\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <DocumentationFile>bin\Debug\Tizen.System.MediaKey.XML</DocumentationFile>
+ <CodeAnalysisRuleSet>ExtendedDesignGuidelineRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\Net45\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ </PropertyGroup>
+ <PropertyGroup>
+ <SignAssembly>true</SignAssembly>
+ </PropertyGroup>
+ <PropertyGroup>
+ <AssemblyOriginatorKeyFile>Tizen.System.MediaKey.snk</AssemblyOriginatorKeyFile>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Xml.Linq" />
+ <Reference Include="System.Data.DataSetExtensions" />
+ <Reference Include="Microsoft.CSharp" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Net.Http" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="GlobalSuppressions.cs" />
+ <Compile Include="Interop\Interop.Libraries.cs" />
+ <Compile Include="Interop\Interop.MediaKey.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="Tizen.System\MediaKey.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="Tizen.System.MediaKey.Net45.project.json" />
+ <None Include="Tizen.System.MediaKey.nuspec" />
+ <None Include="Tizen.System.MediaKey.snk" />
+ </ItemGroup>
+ <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> + -->
+</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 new file mode 100644 index 0000000..d9af4f0 --- /dev/null +++ b/Tizen.System.MediaKey/Tizen.System.MediaKey.Net45.project.json @@ -0,0 +1,11 @@ +{ + "dependencies": { + "Tizen": "1.0.0" + }, + "frameworks": { + "net45": {} + }, + "runtimes": { + "win": {} + } +} diff --git a/Tizen.System.MediaKey/Tizen.System.MediaKey.csproj b/Tizen.System.MediaKey/Tizen.System.MediaKey.csproj index b96c7ea..2a822fe 100755..100644 --- a/Tizen.System.MediaKey/Tizen.System.MediaKey.csproj +++ b/Tizen.System.MediaKey/Tizen.System.MediaKey.csproj @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,9 +9,16 @@ <RootNamespace>
</RootNamespace>
<AssemblyName>Tizen.System.MediaKey</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
+ <PropertyGroup>
+ <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>
+ <TargetFrameworkVersion>v1.6</TargetFrameworkVersion>
+ <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker>
+ <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
+ <NoStdLib>true</NoStdLib>
+ <NoWarn>$(NoWarn);1701;1702</NoWarn>
+ </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
@@ -40,17 +46,6 @@ <PropertyGroup>
<AssemblyOriginatorKeyFile>Tizen.System.MediaKey.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
- <Import Project="CoreFx.References.targets" />
- <ItemGroup Condition=" '$(CoreFxPath)' == '' ">
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Net.Http" />
- <Reference Include="System.Xml" />
- </ItemGroup>
<ItemGroup>
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="Interop\Interop.Libraries.cs" />
@@ -59,32 +54,16 @@ <Compile Include="Tizen.System\MediaKey.cs" />
</ItemGroup>
<ItemGroup>
+ <None Include="Tizen.System.MediaKey.nuspec">
+ <SubType>Designer</SubType>
+ </None>
+ <None Include="Tizen.System.MediaKey.project.json" />
<None Include="Tizen.System.MediaKey.snk" />
</ItemGroup>
<ItemGroup>
<CodeAnalysisDictionary Include="CustomDictionary.xml" />
</ItemGroup>
- <ItemGroup>
- <Reference Include="Tizen">
- <HintPath>..\..\tizen\Tizen\bin\Debug\Tizen.dll</HintPath>
- </Reference>
- <Reference Include="Tizen.Internals">
- <HintPath>..\..\tizen\Tizen.Internals\bin\Debug\Tizen.Internals.dll</HintPath>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\tizen\Tizen.Internals\Tizen.Internals.csproj">
- <Project>{b9aa1cb2-f72d-4a30-a33b-a20c850a38a0}</Project>
- <Name>Tizen.Internals</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\tizen\Tizen\Tizen.csproj">
- <Project>{7659ca59-410d-41a1-9841-586e88bc78c9}</Project>
- <Name>Tizen</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <WCFMetadata Include="Service References\" />
- </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. @@ -93,4 +72,16 @@ <Target Name="AfterBuild"> </Target> -->
-</Project> + <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 + -->
+ <!-- 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>
+ <AutoUnifyAssemblyReferences>true</AutoUnifyAssemblyReferences>
+ </PropertyGroup>
+</Project>
\ No newline at end of file diff --git a/Tizen.System.MediaKey/Tizen.System.MediaKey.nuspec b/Tizen.System.MediaKey/Tizen.System.MediaKey.nuspec new file mode 100644 index 0000000..8ae5f76 --- /dev/null +++ b/Tizen.System.MediaKey/Tizen.System.MediaKey.nuspec @@ -0,0 +1,12 @@ +<?xml version="1.0"?> +<package> + <metadata> + <id>Tizen.System.MediaKey</id> + <version>$version$</version> + <authors>Tizen Developers</authors> + <description>MediaKey API for Tizen.Net</description> + <dependencies> + <dependency id="Tizen" version="1.0.0" /> + </dependencies> + </metadata> +</package> diff --git a/Tizen.System.MediaKey/Tizen.System.MediaKey.project.json b/Tizen.System.MediaKey/Tizen.System.MediaKey.project.json new file mode 100644 index 0000000..beb9e15 --- /dev/null +++ b/Tizen.System.MediaKey/Tizen.System.MediaKey.project.json @@ -0,0 +1,12 @@ +{ + "dependencies": { + "NETStandard.Library": "1.6.0", + "Tizen": "1.0.0" + }, + "frameworks": { + "netstandard1.6": {} + }, + "runtimes": { + "win": {} + } +} diff --git a/packaging/csapi-media-key.spec b/packaging/csapi-media-key.spec index 6d03b53..89dc25b 100755 --- a/packaging/csapi-media-key.spec +++ b/packaging/csapi-media-key.spec @@ -1,4 +1,4 @@ -%{!?dotnet_assembly_path: %define dotnet_assembly_path %{_datadir}/assembly} +%{!?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} @@ -27,8 +27,10 @@ AutoReqProv: no BuildRequires: corefx-managed-32b-ref %endif +BuildRequires: dotnet-build-tools + # C# API Requries -BuildRequires: csapi-tizen +BuildRequires: csapi-tizen-devel %description Tizen Media Key API for C# @@ -40,25 +42,69 @@ cp %{SOURCE1} . %define Assemblies Tizen.System.MediaKey %build +# Build for Net45 for ASM in %{Assemblies}; do -xbuild $ASM/$ASM.csproj \ +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} - /p:NoStdLib=True \ - /p:TargetFrameworkVersion=v5.0 \ - /p:AddAdditionalExplicitAssemblyReferences=False \ - /p:CoreFxPath=%{dotnet_core_path} \ +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 - /p:Configuration=%{BUILDCONF} \ - /p:ReferencePath=%{dotnet_assembly_path} + +# Make NuGet package +dotnet-gbs pack $ASM/$ASM.nuspec --PackageVersion=%{version} --PackageFiles=$ASM/bin + done %install -mkdir -p %{buildroot}%{dotnet_assembly_path} +mkdir -p %{buildroot}%{dotnet_assembly_path}/devel for ASM in %{Assemblies}; do -install -p -m 644 $ASM/bin/%{BUILDCONF}/$ASM.dll %{buildroot}%{dotnet_assembly_path} + 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} +%else + install -p -m 644 $ASM/bin/net45/$ASM.dll %{buildroot}%{dotnet_assembly_path} +%endif done +mkdir -p %{buildroot}/nuget +install -p -m 644 *.nupkg %{buildroot}/nuget + %files %manifest %{name}.manifest %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} + +%files nuget +/nuget/*.nupkg |