diff options
author | Junghoon Park <jh9216.park@samsung.com> | 2016-09-06 19:44:38 +0900 |
---|---|---|
committer | Junghoon Park <jh9216.park@samsung.com> | 2016-09-06 19:44:38 +0900 |
commit | 80bf993404f61f5b56ef164198856a3712d68bf2 (patch) | |
tree | dd27a72a4961611a0b01d447099c308f186e2386 | |
parent | c1b11b477f4bcc5a32b0bea049851ed33d13aa30 (diff) | |
download | widget-control-80bf993404f61f5b56ef164198856a3712d68bf2.tar.gz widget-control-80bf993404f61f5b56ef164198856a3712d68bf2.tar.bz2 widget-control-80bf993404f61f5b56ef164198856a3712d68bf2.zip |
Fix project files to support netstandard 1.6
Change-Id: I300d2772385f28f13bc71127d40afaadfd8f1aef
Signed-off-by: Junghoon Park <jh9216.park@samsung.com>
10 files changed, 249 insertions, 345 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.Applications.WidgetControl/CoreFx.References.targets b/Tizen.Applications.WidgetControl/CoreFx.References.targets deleted file mode 100644 index dab29ec..0000000 --- a/Tizen.Applications.WidgetControl/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.Applications.WidgetControl/CustomDictionary.xml b/Tizen.Applications.WidgetControl/CustomDictionary.xml deleted file mode 100755 index e69de29..0000000 --- a/Tizen.Applications.WidgetControl/CustomDictionary.xml +++ /dev/null diff --git a/Tizen.Applications.WidgetControl/GlobalSuppressions.cs b/Tizen.Applications.WidgetControl/GlobalSuppressions.cs Binary files differdeleted file mode 100755 index 9d74253..0000000 --- a/Tizen.Applications.WidgetControl/GlobalSuppressions.cs +++ /dev/null diff --git a/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.Net45.csproj b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.Net45.csproj new file mode 100644 index 0000000..05d43ee --- /dev/null +++ b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.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.Applications.WidgetControl</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.Applications.WidgetControl.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.Applications.WidgetControl.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="Interop\Interop.Libraries.cs" />
+ <Compile Include="Interop\Interop.WidgetService.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="Tizen.Applications\WidgetControl.cs" />
+ <Compile Include="Tizen.Applications\WidgetLifecycleEventArgs.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="Tizen.Applications.WidgetControl.Net45.project.json" />
+ <None Include="Tizen.Applications.WidgetControl.nuspec" />
+ <None Include="Tizen.Applications.WidgetControl.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>
diff --git a/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.Net45.project.json b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.Net45.project.json new file mode 100644 index 0000000..d8f9efc --- /dev/null +++ b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.Net45.project.json @@ -0,0 +1,12 @@ +{ + "dependencies": { + "Tizen": "1.0.0", + "Tizen.Applications": "1.0.0", + }, + "frameworks": { + "net45": {} + }, + "runtimes": { + "win": {} + } +} diff --git a/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.csproj b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.csproj index e8adb8c..97c2fa1 100755 --- a/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.csproj +++ b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.csproj @@ -1,29 +1,37 @@ <?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>
+ <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>8.0.30703</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{A667ADA4-E7DB-4E45-9D31-491024750EE1}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>
- </RootNamespace>
+ <RootNamespace>Tizen.Applications.WidgetControl</RootNamespace>
<AssemblyName>Tizen.Applications.WidgetControl</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
+ <DefaultLanguage>en-US</DefaultLanguage>
+ </PropertyGroup>
+ <PropertyGroup>
+ <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>
+ <TargetFrameworkVersion>v1.6</TargetFrameworkVersion>
+ <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker>
+ <TargetFrameworkMoniker>.NETStandard,Version=v1.6</TargetFrameworkMoniker>
+ <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
+ <NoStdLib>true</NoStdLib>
+ <NoWarn>$(NoWarn);1701</NoWarn>
+ <UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
- <Optimize>true</Optimize>
+ <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <DocumentationFile>bin\Debug\Tizen.Applications.WidgetControl.XML</DocumentationFile>
- <CodeAnalysisRuleSet>ExtendedDesignGuidelineRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -32,73 +40,61 @@ <DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
- <PropertyGroup>
- <SignAssembly>true</SignAssembly>
- </PropertyGroup>
- <PropertyGroup>
- <AssemblyOriginatorKeyFile>Tizen.Applications.WidgetControl.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>
+ <None Include="Tizen.Applications.WidgetControl.project.json" />
</ItemGroup>
<ItemGroup>
- <Compile Include="GlobalSuppressions.cs" />
<Compile Include="Interop\Interop.Libraries.cs" />
<Compile Include="Interop\Interop.WidgetService.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Tizen.Applications\WidgetControl.cs" />
<Compile Include="Tizen.Applications\WidgetLifecycleEventArgs.cs" />
</ItemGroup>
- <ItemGroup>
- <None Include="Tizen.Applications.WidgetControl.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>
- <Reference Include="Tizen.Applications">
- <HintPath>..\..\task\application\Tizen.Applications\obj\Debug\Tizen.Applications.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>
- <ProjectReference Include="..\..\application\Tizen.Applications\Tizen.Applications.csproj">
- <Project>{d2d1a3ce-000e-4ab3-81c4-a8a44a008989}</Project>
- <Name>Tizen.Applications</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. - <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> + <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>
+ <!-- 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>
\ No newline at end of file diff --git a/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.nuspec b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.nuspec new file mode 100644 index 0000000..cf46c88 --- /dev/null +++ b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.nuspec @@ -0,0 +1,13 @@ +<?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> + <dependencies> + <dependency id="Tizen" version="1.0.0" /> + <dependency id="Tizen.Applications" version="1.0.0" /> + </dependencies> + </metadata> +</package> diff --git a/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.project.json b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.project.json new file mode 100755 index 0000000..a9f948a --- /dev/null +++ b/Tizen.Applications.WidgetControl/Tizen.Applications.WidgetControl.project.json @@ -0,0 +1,18 @@ +{
+ "buildOptions": {
+ "debugType": "portable",
+ "platform": "AnyCPU",
+ "preserveCompilationContext": true
+ },
+ "dependencies": {
+ "NETStandard.Library": "1.6.0",
+ "Tizen": "1.0.0",
+ "Tizen.Applications": "1.0.0"
+ },
+ "runtimes": {
+ "win": {}
+ },
+ "frameworks": {
+ "netstandard1.6": {}
+ }
+}
\ No newline at end of file diff --git a/packaging/csapi-widget-control.spec b/packaging/csapi-widget-control.spec index 20be7ff..122375a 100755 --- a/packaging/csapi-widget-control.spec +++ b/packaging/csapi-widget-control.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,9 +27,12 @@ AutoReqProv: no BuildRequires: corefx-managed-32b-ref %endif +BuildRequires: dotnet-build-tools + # C# API Requries -BuildRequires: csapi-tizen -BuildRequires: csapi-application +BuildRequires: csapi-tizen-devel +BuildRequires: csapi-application-devel + %description Tizen widget control API for C# @@ -41,25 +44,69 @@ cp %{SOURCE1} . %define Assemblies Tizen.Applications.WidgetControl %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 |